corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1306532 - Post process node array in ReplaceOrphanedStructure to remove all descendants of replacement node. r=masayuki

Browse Source
This commit is contained in:
William Chen
2017-01-09 10:11:04 -08:00
parent 3b3a2c30b3
commit 05f0455091
3 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
editor/libeditor/HTMLEditorDataTransfer.cpp
View File

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

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

@@ -211,6 +211,9 @@ skip-if = toolkit == 'android'
[test_bug1248185.html] [test_bug1248185.html]
[test_bug1258085.html] [test_bug1258085.html]
[test_bug1268736.html] [test_bug1268736.html]
[test_bug1306532.html]
subsuite = clipboard
skip-if = toolkit == 'android'
[test_bug1310912.html] [test_bug1310912.html]
skip-if = toolkit == 'android' # bug 1315898 skip-if = toolkit == 'android' # bug 1315898
[test_bug1314790.html] [test_bug1314790.html]

64
editor/libeditor/tests/test_bug1306532.html Normal file
View File

@@ -0,0 +1,64 @@
<!DOCTYPE HTML>
<html><head>
<title>Test for bug 1306532</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(headingone, 0);
startRange.setEnd(celltwo, 0);
selection.removeAllRanges();
selection.addRange(startRange);
SpecialPowers.wrap(document).execCommand("copy", false, null);
// Paste content into "pasteframe"
var pasteContainer = pasteframe.contentDocument.body;
var pasteRange = pasteframe.contentDocument.createRange();
pasteRange.selectNodeContents(pasteContainer);
pasteRange.collapse(false);
selection.removeAllRanges();
selection.addRange(pasteRange);
SpecialPowers.wrap(pasteframe.contentDocument).execCommand("paste", false, null);
is(pasteContainer.querySelector("#headingone").textContent, "Month", "First heading should be 'Month'.");
is(pasteContainer.querySelector("#headingtwo").textContent, "Savings", "Second heading should be 'Savings'.");
is(pasteContainer.querySelector("#cellone").textContent, "January", "First cell should be 'January'.");
is(pasteContainer.querySelector("#celltwo").textContent, "$100", "Second cell should be '$100'.");
SimpleTest.finish();
}
SimpleTest.waitForExplicitFinish();
</script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1306532">Mozilla Bug 1306532</a>
<p id="display"></p>
<pre id="test">
</pre>
<div id="container">
<table border="1">
<tr>
<th id="headingone">Month</th>
<th id="headingtwo">Savings</th>
</tr>
<tr>
<td id="cellone">January</td>
<td id="celltwo">$100</td>
</tr>
</table>
</div>
<iframe onload="runTest();" id="pasteframe" src="data:text/html,<html><body contenteditable='true'>"></iframe>
</body>
</html>