mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1140105 - Can't query for a specific font face when the selection is collapsed. r=ehsan 

--HG--
extra : rebase_source : bfdc26a4bb9506f8adff9eadd94c1ad5e7d1dc03
This commit is contained in:
Jorg K 2015-04-24 05:57:00 -04:00
Родитель d2ec9a5068
Коммит a4d2a8c99c
4 изменённых файлов: 75 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
dom/imptests/failures/editing/conformancetest/test_runtest.html.json
Просмотреть файл

@ -6419,6 +6419,7 @@
"[[\"stylewithcss\",\"true\"],[\"inserttext\",\"a\"]] \"[foo<u>bar]</u>baz\" compare innerHTML":true,
"[[\"stylewithcss\",\"false\"],[\"inserttext\",\"a\"]] \"[foo<u>bar]</u>baz\" compare innerHTML":true,
"[[\"inserttext\",\"a\"]] \"[foo<a href=http://www.google.com>bar]</a>baz\" compare innerHTML":true,
"[[\"inserttext\",\"a\"]] \"foo<font color=brown><a href=http://www.google.com>[bar]</a></font>baz\" compare innerHTML":true,
"[[\"stylewithcss\",\"true\"],[\"inserttext\",\"a\"]] \"[foo<font face=sans-serif>bar]</font>baz\" compare innerHTML":true,
"[[\"stylewithcss\",\"false\"],[\"inserttext\",\"a\"]] \"[foo<font face=sans-serif>bar]</font>baz\" compare innerHTML":true,
"[[\"stylewithcss\",\"true\"],[\"inserttext\",\"a\"]] \"[foo<font size=4>bar]</font>baz\" compare innerHTML":true,

3
editor/libeditor/nsHTMLEditorStyle.cpp
Просмотреть файл

@ -1078,6 +1078,9 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom& aProperty,
if (mHTMLCSSUtils->IsCSSEditableProperty(collapsedNode, &aProperty,
aAttribute)) {
if (aValue) {
tOutString.Assign(*aValue);
}
*aFirst = *aAny = *aAll =
mHTMLCSSUtils->IsCSSEquivalentToHTMLInlineStyleSet(collapsedNode,
&aProperty, aAttribute, tOutString, nsHTMLCSSUtils::eComputed);

1
editor/libeditor/tests/chrome.ini
Просмотреть файл

@ -24,6 +24,7 @@ skip-if = buildapp == 'mulet'
[test_bug1100966.html]
[test_bug1102906.html]
[test_bug1101392.html]
[test_bug1140105.html]
[test_bug1154791.html]
[test_composition_event_created_in_chrome.html]
[test_contenteditable_text_input_handling.html]

70
editor/libeditor/tests/test_bug1140105.html Normal file
Просмотреть файл

@ -0,0 +1,70 @@
<!DOCTYPE>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1140105
-->
<head>
<title>Test for Bug 1140105</title>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
<script type="text/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
</head>
<body>
<div id="display">
</div>
<div id="content" contenteditable><font face="Arial">1234567890</font></div>
<pre id="test">
</pre>
<script class="testbody" type="application/javascript">
/** Test for Bug 1140105 **/
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(function() {
var div = document.getElementById("content");
div.focus();
synthesizeMouseAtCenter(div, {});
synthesizeKey("VK_LEFT", {});
var sel = window.getSelection();
var selRange = sel.getRangeAt(0);
is(selRange.endContainer.nodeName, "#text", "selection should be in text node");
is(selRange.endOffset, 9, "offset should be 9");
var firstHas = {};
var anyHas = {};
var allHas = {};
var editor = getEditor();
var atomService = Components.classes["@mozilla.org/atom-service;1"].getService(Components.interfaces.nsIAtomService);
var propAtom = atomService.getAtom("font");
editor.getInlineProperty(propAtom, "face", "Arial", firstHas, anyHas, allHas);
is(firstHas.value, true, "Test for Arial: firstHas: true expected");
is(anyHas.value, true, "Test for Arial: anyHas: true expected");
is(allHas.value, true, "Test for Arial: allHas: true expected");
editor.getInlineProperty(propAtom, "face", "Courier", firstHas, anyHas, allHas);
is(firstHas.value, false, "Test for Courier: firstHas: false expected");
is(anyHas.value, false, "Test for Courier: anyHas: false expected");
is(allHas.value, false, "Test for Courier: allHas: false expected");
SimpleTest.finish();
});
function getEditor() {
var Ci = Components.interfaces;
var editingSession = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIEditingSession);
var editor = editingSession.getEditorForWindow(window);
editor.QueryInterface(Ci.nsIHTMLEditor);
return editor;
}
</script>
</body>
</html>