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

Bug 1435123 - HTMLEditor::GetBlock() has to specify given ancestor limit node to HTMLEditor::GetBlockNodeParent() r=m_kato 

This is a simple bug of internal API of HTMLEditor.  HTMLEditor::GetBlock()
tries to retrieve nearest ancestor block node (including itself) of a node.
HTMLEditor::GetBlock() may have ancestor limiter typically it's active
editing host to prevent to modify editing host or its ancestor accidentally.

However, it forgets to call HTMLEditor::GetBlockNodeParent() with the given
ancestor limit node.  Therefore, if editing host is an inline element and
its parent is a block element, the editing host is split accidentally.

MozReview-Commit-ID: Ermmxdnk4KB

--HG--
extra : rebase_source : c9b57c5bb28cd63b6f16702317f7ddb7fb5a26f6
This commit is contained in:
Masayuki Nakano 2018-03-29 18:57:57 +09:00
Родитель 3c0c5251d7
Коммит 5b5492e588
3 изменённых файлов: 69 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -888,7 +888,7 @@ HTMLEditor::GetBlock(nsINode& aNode,
if (NodeIsBlockStatic(&aNode)) {
return aNode.AsElement();
}
return GetBlockNodeParent(&aNode);
return GetBlockNodeParent(&aNode, aAncestorLimiter);
}
/**

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

@ -271,6 +271,7 @@ skip-if = toolkit == 'android' # bug 1054087
skip-if = os == 'android'
[test_inline_style_cache.html]
[test_inlineTableEditing.html]
[test_insertParagraph_in_inline_editing_host.html]
[test_keypress_untrusted_event.html]
[test_objectResizing.html]
[test_root_element_replacement.html]

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

@ -0,0 +1,67 @@
<!DOCTYPE html>
<html>
<head>
<title>Test "insertParagraph" command in inline editing host</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
</head>
<body>
<span contenteditable>foobar</span>
<hr>
<p><span contenteditable>foobar</span></p>
<hr>
<div><span contenteditable>foobar</span></div>
<hr>
<div contenteditable><p contenteditable="false"><span contenteditable>foobar</span></p></div>
<p id="display">
</p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
<script class="testbody" type="application/javascript">
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(() => {
var selection = document.getSelection();
var editors = document.querySelectorAll("span[contenteditable]");
var editor = editors.item(0);
editor.focus();
selection.collapse(editor.firstChild, 3);
document.execCommand("insertParagraph", false);
is(editor.innerHTML, "foo<br>bar",
"insertParagraph should insert <br> element (inline editing host is in <body>)");
editor = editors.item(1);
editor.focus();
selection.collapse(editor.firstChild, 3);
document.execCommand("insertParagraph", false);
is(editor.parentNode.innerHTML, "<span contenteditable=\"\">foo<br>bar</span>",
"insertParagraph should insert <br> element (inline editing host is in <p>)");
editor = editors.item(2);
editor.focus();
selection.collapse(editor.firstChild, 3);
document.execCommand("insertParagraph", false);
is(editor.parentNode.innerHTML, "<span contenteditable=\"\">foo<br>bar</span>",
"insertParagraph should insert <br> element (inline editing host is in <div>)");
editor = editors.item(3);
editor.focus();
selection.collapse(editor.firstChild, 3);
document.execCommand("insertParagraph", false);
is(editor.parentNode.parentNode.innerHTML, "<p contenteditable=\"false\"><span contenteditable=\"\">foo<br>bar</span></p>",
"insertParagraph should insert <br> element (inline editing host is in <p contenteditable=\"false\"> in <div contenteditable>)");
SimpleTest.finish();
});
</script>
</body>
</html>