Bug 1123505 - part 2, tests.

dom/base/test/copypaste.js

@@ -52,30 +52,33 @@ function testCopyPaste (isXHTML) {
     if (!suppressHTMLCheck)
       ok(clipboard.hasDataMatchingFlavors(["text/html"], 1,1), "check text/html");
   }
-  function copyToClipboard(node, suppressUnicodeCheck) {
+  function clear(node, suppressUnicodeCheck) {
     textarea.blur();
     clipboard.emptyClipboard(1);
     var sel = window.getSelection();
     sel.removeAllRanges();
+  }
+  function copyToClipboard(node, suppressUnicodeCheck) {
+    clear();
     var r = document.createRange();
     r.selectNode(node);
     window.getSelection().addRange(r);
     copySelectionToClipboard(suppressUnicodeCheck);
   }
-  function copyRangeToClipboard(startNode,startIndex,endNode,endIndex,suppressUnicodeCheck) {
-    textarea.blur();
-    clipboard.emptyClipboard(1);
+  function addRange(startNode,startIndex,endNode,endIndex) {
     var sel = window.getSelection();
-    sel.removeAllRanges();
     var r = document.createRange();
     r.setStart(startNode,startIndex)
     r.setEnd(endNode,endIndex)
-    window.getSelection().addRange(r);
+    sel.addRange(r);
+  }
+  function copyRangeToClipboard(startNode,startIndex,endNode,endIndex,suppressUnicodeCheck) {
+    clear();
+    addRange(startNode,startIndex,endNode,endIndex);
     copySelectionToClipboard(suppressUnicodeCheck);
   }
   function copyChildrenToClipboard(id) {
-    textarea.blur();
-    clipboard.emptyClipboard(1);
+    clear();
     window.getSelection().selectAllChildren(document.getElementById(id));
     copySelectionToClipboard();
   }
@@ -105,6 +108,12 @@ function testCopyPaste (isXHTML) {
     textarea.editor.paste(1);
     is(textarea.value, expected, "value of the textarea after the paste");
   }
+  function testPasteHTML(id, expected) {
+    var contentEditable = $(id);
+    contentEditable.focus();
+    synthesizeKey("v", {accelKey: 1});
+    is(contentEditable.innerHTML, expected, id+".innerHtml after the paste");
+  }
   function testSelectionToString(expected) {
     is(window.getSelection().toString().replace(/\r\n/g,"\n"), expected, "Selection.toString");
   }
@@ -221,6 +230,95 @@ if (false) {
   copyRangeToClipboard($("div10").childNodes[1],0, $("div10").childNodes[1],1,suppressUnicodeCheckIfHidden);
   testSelectionToString("");
 
+  if (!isXHTML) {
+    // ============ copy/paste multi-range selection (bug 1123505)
+    // with text start node
+    var sel = window.getSelection();
+    sel.removeAllRanges();
+    var r = document.createRange();
+    var ul = $('ul1');
+    var parent = ul.parentNode;
+    r.setStart(parent, 0);
+    r.setEnd(parent.firstChild, 15);  // the end of "Copy..."
+    sel.addRange(r);
+
+    r = document.createRange();
+    r.setStart(ul, 1);  // before the space inside the UL
+    r.setEnd(parent, 2);  // after the UL
+    sel.addRange(r);
+    copySelectionToClipboard(true);
+    testPasteHTML('contentEditable1', 'Copy1then Paste');
+
+    // with text end node
+    var sel = window.getSelection();
+    sel.removeAllRanges();
+    var r = document.createRange();
+    var ul = $('ul2');
+    var parent = ul.parentNode;
+    r.setStart(parent, 0);
+    r.setEnd(ul, 1);  // after the space
+    sel.addRange(r);
+
+    r = document.createRange();
+    r.setStart(parent.childNodes[1], 0);  // the start of "Copy..."
+    r.setEnd(parent, 2);
+    sel.addRange(r);
+    copySelectionToClipboard(true);
+    testPasteHTML('contentEditable2', 'Copy2then Paste');
+
+    // with text end node and non-empty start
+    var sel = window.getSelection();
+    sel.removeAllRanges();
+    var r = document.createRange();
+    var ul = $('ul3');
+    var parent = ul.parentNode;
+    r.setStart(parent, 0);
+    r.setEnd(ul, 1);  // after the space
+    sel.addRange(r);
+
+    r = document.createRange();
+    r.setStart(parent.childNodes[1], 0);  // the start of "Copy..."
+    r.setEnd(parent, 2);
+    sel.addRange(r);
+    copySelectionToClipboard(true);
+    testPasteHTML('contentEditable3', '<ul id="ul3"><li>\n<br></li></ul>Copy3then Paste');
+
+    // with elements of different depth
+    var sel = window.getSelection();
+    sel.removeAllRanges();
+    var r = document.createRange();
+    var div1 = $('div1s');
+    var parent = div1.parentNode;
+    r.setStart(parent, 0);
+    r.setEnd(document.getElementById('div1se1'), 1);  // after the "inner" DIV
+    sel.addRange(r);
+
+    r = document.createRange();
+    r.setStart(div1.childNodes[1], 0);  // the start of "after"
+    r.setEnd(parent, 1);
+    sel.addRange(r);
+    copySelectionToClipboard(true);
+    testPasteHTML('contentEditable4', '<div id="div1s"><div id="div1se1">before</div></div><div id="div1s">after</div>');
+
+    // with elements of different depth, and a text node at the end
+    var sel = window.getSelection();
+    sel.removeAllRanges();
+    var r = document.createRange();
+    var div1 = $('div2s');
+    var parent = div1.parentNode;
+    r.setStart(parent, 0);
+    r.setEnd(document.getElementById('div2se1'), 1);  // after the "inner" DIV
+    sel.addRange(r);
+
+    r = document.createRange();
+    r.setStart(div1.childNodes[1], 0);  // the start of "after"
+    r.setEnd(parent, 1);
+    sel.addRange(r);
+    copySelectionToClipboard(true);
+    testPasteHTML('contentEditable5', '<div id="div2s"><div id="div2se1">before</div></div><div id="div2s">after</div>');
+
+  }
+
   // ============ copy/paste test from/to a textarea
 
   var val = "1\n 2\n  3";
@@ -246,6 +344,21 @@ if (false) {
   copyToClipboard($("tr1"));
   testClipboardValue("text/unicode", "foo\tbar");
 
+  // ============ spanning multiple rows
+
+  copyRangeToClipboard($("tr2"),0,$("tr3"),0);
+  testClipboardValue("text/unicode", "1\t2\n3\t4\n");
+  testClipboardValue("text/html", '<table><tbody><tr id="tr2"><tr id="tr2"><td>1</td><td>2</td></tr><tr><td>3</td><td>4</td></tr><tr id="tr3"></tr></tr></tbody></table>');
+
+  // ============ spanning multiple rows in multi-range selection
+
+  clear();
+  addRange($("tr2"),0,$("tr2"),2);
+  addRange($("tr3"),0,$("tr3"),2);
+  copySelectionToClipboard();
+  testClipboardValue("text/unicode", "1\t2\n5\t6");
+  testClipboardValue("text/html", '<table><tbody><tr id="tr2"><td>1</td><td>2</td></tr><tr id="tr3"><td>5</td><td>6</td></tr></tbody></table>');
+
   // ============ manipulating Selection in oncopy
 
   copyRangeToClipboard($("div11").childNodes[0],0, $("div11").childNodes[1],2);

dom/base/test/test_copypaste.html

@@ -5,6 +5,7 @@
 <head>
   <title>Test for copy/paste</title>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
   <script type="text/javascript" src="copypaste.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
@@ -63,6 +64,25 @@ addLoadEvent(function () testCopyPaste(false));
   T<textarea>     </textarea>
 </div>
 
+<div>Copy1then Paste<ul id="ul1"><li>LI</li>
+</ul></div>
+
+<div><ul id="ul2">
+<li>LI</li></ul>Copy2then Paste</div>
+
+<div><ul id="ul3"><li>
+<li>LI</li></ul>Copy3then Paste</div>
+
+<div><div id="div1s"><div id="div1se1">before<div>inner</div></div>after</div></div>
+<div><div id="div2s"><div id="div2se1">before<div>inner</div></div>after</div>
+</div>
+
+<div id="contentEditable1" contenteditable spellcheck="false"></div>
+<div id="contentEditable2" contenteditable spellcheck="false"></div>
+<div id="contentEditable3" contenteditable spellcheck="false"></div>
+<div id="contentEditable4" contenteditable spellcheck="false"></div>
+<div id="contentEditable5" contenteditable spellcheck="false"></div>
+
 <div id="div6" style="display:none"></div>
 <script>
 var x = $("div6")
@@ -86,6 +106,7 @@ x.appendChild(document.createTextNode('10'))
 <div id="div13">_<noscript>FAIL</noscript>_</div>
 
 <table><tr id=tr1><td>foo</td><td>bar</td></tr></table>
+<table><tr id=tr2><td>1</td><td>2</td></tr><tr><td>3</td><td>4</td></tr><tr id=tr3><td>5</td><td>6</td></tr></table>
 
 </div>
 </body>