wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1247483 - Only replace nodes in nsHTMLEditor::ReplaceOrphanedStructure if all nodes in node list are descendants of replacement node. r=ehsan

Browse Source
This commit is contained in:
William Chen 2016-02-26 17:34:40 -08:00
parent 94c4427375
commit 9c5dd6e780
3 changed files with 78 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editor/libeditor/nsHTMLDataTransfer.cpp
View File

@ -2297,22 +2297,26 @@ nsHTMLEditor::ReplaceOrphanedStructure(StartOrEnd aStartOrEnd,
} }
// If we found substructure, paste it instead of its descendants. // If we found substructure, paste it instead of its descendants.
// Postprocess list to remove any descendants of this node so that we don't // Only replace with the substructure if all the nodes in the list are
// insert them twice. // descendants.
while (aNodeArray.Length()) { bool shouldReplaceNodes = true;
int32_t idx = aStartOrEnd == StartOrEnd::start ? 0 for (uint32_t i = 0; i < aNodeArray.Length(); i++) {
: aNodeArray.Length() - 1; uint32_t idx = aStartOrEnd == StartOrEnd::start ?
i : (aNodeArray.Length() - i - 1);
OwningNonNull<nsINode> endpoint = aNodeArray[idx]; OwningNonNull<nsINode> endpoint = aNodeArray[idx];
if (!nsEditorUtils::IsDescendantOf(endpoint, replaceNode)) { if (!nsEditorUtils::IsDescendantOf(endpoint, replaceNode)) {
shouldReplaceNodes = false;
break; break;
} }
aNodeArray.RemoveElementAt(idx);
} }
// Now replace the removed nodes with the structural parent if (shouldReplaceNodes) {
if (aStartOrEnd == StartOrEnd::end) { // Now replace the removed nodes with the structural parent
aNodeArray.AppendElement(*replaceNode); aNodeArray.Clear();
} else { if (aStartOrEnd == StartOrEnd::end) {
aNodeArray.InsertElementAt(0, *replaceNode); aNodeArray.AppendElement(*replaceNode);
} else {
aNodeArray.InsertElementAt(0, *replaceNode);
}
} }
} }

2
editor/libeditor/tests/mochitest.ini
View File

@ -170,3 +170,5 @@ skip-if = toolkit == 'android'
[test_backspace_vs.html] [test_backspace_vs.html]
[test_css_chrome_load_access.html] [test_css_chrome_load_access.html]
skip-if = toolkit == 'android' # chrome urls not available due to packaging skip-if = toolkit == 'android' # chrome urls not available due to packaging
[test_bug1247483.html]
skip-if = toolkit == 'android'

61
editor/libeditor/tests/test_bug1247483.html Normal file
View File

@ -0,0 +1,61 @@
<!DOCTYPE HTML>
<html><head>
<title>Test for bug 1247483</title>
<style src="/tests/SimpleTest/test.css" type="text/css"></style>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<script class="testbody" type="application/javascript">
function runTest() {
// Copy content from table.
var selection = getSelection();
var startRange = document.createRange();
startRange.setStart(document.getElementById("start"), 0);
startRange.setEnd(document.getElementById("end"), 2);
selection.removeAllRanges();
selection.addRange(startRange);
SpecialPowers.wrap(document).execCommand("copy", false, null);
// Paste content into "pastecontainer"
var pasteContainer = document.getElementById("pastecontainer");
var pasteRange = document.createRange();
pasteRange.selectNodeContents(pasteContainer);
pasteRange.collapse(false);
selection.removeAllRanges();
selection.addRange(pasteRange);
SpecialPowers.wrap(document).execCommand("paste", false, null);
is(pasteContainer.querySelectorAll("td").length, 4, "4 <td> should be pasted.");
document.execCommand("undo", false, null);
is(pasteContainer.querySelectorAll("td").length, 0, "Undo should have remove the 4 pasted <td>.");
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
addLoadEvent(runTest);
</script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1247483">Mozilla Bug 1247483</a>
<p id="display"></p>
<pre id="test">
</pre>
<div id="container" contenteditable="true">
<table>
<tr id="start"><td>1 1</td><td>1 2</td></tr>
<tr id="end"><td>2 1</td><td>2 2</td></tr>
</table>
</div>
<div id="pastecontainer" contenteditable="true">
</div>
</body>
</html>