Skip to content
Snippets Groups Projects
Commit 6f3ab115 authored by Henri Sivonen's avatar Henri Sivonen
Browse files

Bug 739537 - No longer drop leading space from the plain text clipboard flavor...

Bug 739537 - No longer drop leading space from the plain text clipboard flavor when exporting both HTML and plain text to clipboard. r=smaug.
parent c2a6dd87
No related branches found
No related tags found
No related merge requests found
...@@ -188,10 +188,6 @@ SelectionCopyHelper(nsISelection *aSel, nsIDocument *aDoc, ...@@ -188,10 +188,6 @@ SelectionCopyHelper(nsISelection *aSel, nsIDocument *aDoc,
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
// Emulate the collateral damage from bug 564737. Remove the following
// line to fix bug 739537.
plaintextBuffer.Trim(" ", true, false);
// Now create the version that shows HTML context // Now create the version that shows HTML context
mimeType.AssignLiteral(kHTMLMime); mimeType.AssignLiteral(kHTMLMime);
......
...@@ -132,35 +132,35 @@ function testCopyPaste () { ...@@ -132,35 +132,35 @@ function testCopyPaste () {
copyChildrenToClipboard("alist"); copyChildrenToClipboard("alist");
testSelectionToString(" bla\n\n foo\n bar\n\n"); testSelectionToString(" bla\n\n foo\n bar\n\n");
testClipboardValue("text/unicode", "bla\n\n foo\n bar\n\n"); testClipboardValue("text/unicode", " bla\n\n foo\n bar\n\n");
testClipboardValue("text/html", "<div id=\"alist\">\n bla\n <ul>\n <li>foo</li>\n \n <li>bar</li>\n </ul>\n </div>"); testClipboardValue("text/html", "<div id=\"alist\">\n bla\n <ul>\n <li>foo</li>\n \n <li>bar</li>\n </ul>\n </div>");
testPasteText("bla\n\n foo\n bar\n\n"); testPasteText(" bla\n\n foo\n bar\n\n");
copyChildrenToClipboard("blist"); copyChildrenToClipboard("blist");
testSelectionToString(" mozilla\n\n foo\n bar\n\n"); testSelectionToString(" mozilla\n\n foo\n bar\n\n");
testClipboardValue("text/unicode", "mozilla\n\n foo\n bar\n\n"); testClipboardValue("text/unicode", " mozilla\n\n foo\n bar\n\n");
testClipboardValue("text/html", "<div id=\"blist\">\n mozilla\n <ol>\n <li>foo</li>\n \n <li>bar</li>\n </ol>\n </div>"); testClipboardValue("text/html", "<div id=\"blist\">\n mozilla\n <ol>\n <li>foo</li>\n \n <li>bar</li>\n </ol>\n </div>");
testPasteText("mozilla\n\n foo\n bar\n\n"); testPasteText(" mozilla\n\n foo\n bar\n\n");
copyChildrenToClipboard("clist"); copyChildrenToClipboard("clist");
testSelectionToString(" mzla\n\n foo\n bazzinga!\n bar\n\n"); testSelectionToString(" mzla\n\n foo\n bazzinga!\n bar\n\n");
testClipboardValue("text/unicode", "mzla\n\n foo\n bazzinga!\n bar\n\n"); testClipboardValue("text/unicode", " mzla\n\n foo\n bazzinga!\n bar\n\n");
testClipboardValue("text/html", "<div id=\"clist\">\n mzla\n <ul>\n <li>foo<ul>\n <li>bazzinga!</li>\n </ul></li>\n \n <li>bar</li>\n </ul>\n </div>"); testClipboardValue("text/html", "<div id=\"clist\">\n mzla\n <ul>\n <li>foo<ul>\n <li>bazzinga!</li>\n </ul></li>\n \n <li>bar</li>\n </ul>\n </div>");
testPasteText("mzla\n\n foo\n bazzinga!\n bar\n\n"); testPasteText(" mzla\n\n foo\n bazzinga!\n bar\n\n");
copyChildrenToClipboard("div4"); copyChildrenToClipboard("div4");
testSelectionToString(" Tt t t "); testSelectionToString(" Tt t t ");
testClipboardValue("text/unicode", "Tt t t "); testClipboardValue("text/unicode", " Tt t t ");
testClipboardValue("text/html", "<div id=\"div4\">\n T<textarea>t t t</textarea>\n</div>"); testClipboardValue("text/html", "<div id=\"div4\">\n T<textarea>t t t</textarea>\n</div>");
testInnerHTML("div4", "\n T<textarea>t t t</textarea>\n"); testInnerHTML("div4", "\n T<textarea>t t t</textarea>\n");
testPasteText("Tt t t "); testPasteText(" Tt t t ");
copyChildrenToClipboard("div5"); copyChildrenToClipboard("div5");
testSelectionToString(" T "); testSelectionToString(" T ");
testClipboardValue("text/unicode", "T "); testClipboardValue("text/unicode", " T ");
testClipboardValue("text/html", "<div id=\"div5\">\n T<textarea> </textarea>\n</div>"); testClipboardValue("text/html", "<div id=\"div5\">\n T<textarea> </textarea>\n</div>");
testInnerHTML("div5", "\n T<textarea> </textarea>\n"); testInnerHTML("div5", "\n T<textarea> </textarea>\n");
testPasteText("T "); testPasteText(" T ");
copyRangeToClipboard($("div6").childNodes[0],0, $("div6").childNodes[1],1); copyRangeToClipboard($("div6").childNodes[0],0, $("div6").childNodes[1],1);
testSelectionToString(""); testSelectionToString("");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment