Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2025-01-03 05:00:13 -05:00
Code Issues Activity

fix: handle insert table by CF_HTML

Browse source 
ms html clipboard format CF_HTML handles table like below if we copy part of table.
it makes problem when copying table from ms product such as ie, excel, powerpoint then pasting to squire.

<TABLE BORDER>
<!--StartFragment-->
<TR><TD>Item 6</TD><TD>Item 7</TD></TR><TR><TD>Item 10</TD><TD>Item 11</TD></TR>
<!--EndFragment-->
</TABLE>

and

<TABLE BORDER><TR>
<!--StartFragment-->
<TD>Item</TD>
<!--EndFragment-->
</TR></TABLE>

https://msdn.microsoft.com/en-us/library/windows/desktop/ms649015(v=vs.85).aspx
#274
This commit is contained in:
kyuwoo.choi 2017-04-20 10:31:52 +09:00 committed by Neil Jenkins
parent bb593e879a
commit 9eacfb7b22
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/Editor.js
View file

@ -1749,6 +1749,14 @@ proto.insertHTML = function ( html, isPaste ) {
} }
// Parse HTML into DOM tree // Parse HTML into DOM tree
div = this.createElement( 'DIV' ); div = this.createElement( 'DIV' );
// wrap with tr if html contains dangling td tags
if (html.match(/<\/td>((?!<\/tr>)[\s\S])*$/i)) {
html = '<TR>' + html + '</TR>';
}
// wrap with table if html contains dangling tr tags
if (html.match(/<\/tr>((?!<\/table>)[\s\S])*$/i)) {
html = '<TABLE>' + html + '</TABLE>';
}
div.innerHTML = html; div.innerHTML = html;
frag = doc.createDocumentFragment(); frag = doc.createDocumentFragment();
frag.appendChild( empty( div ) ); frag.appendChild( empty( div ) );

12
test/squire.spec.js
View file

@ -351,6 +351,18 @@ describe('Squire RTE', function () {
}) })
}); });
describe('insertHTML', function() {
it('fix CF_HTML incomplete table', function() {
editor.insertHTML('<table><tbody><tr><!--StartFragment--><td>text</td><!--EndFragment--></tr></tbody></table>');
expect(editor.getHTML(), 'to contain', '<table><tbody><tr><td>text<br></td></tr></tbody></table>');
editor.setHTML('');
editor.insertHTML('<table><tbody><!--StartFragment--><tr><td>text1</td><td>text2</td></tr><!--EndFragment--></tbody></table>');
expect(editor.getHTML(), 'to contain', '<table><tbody><tr><td>text1<br></td><td>text2<br></td></tr></tbody></table>');
});
});
afterEach(function () { afterEach(function () {
editor = null; editor = null;
var iframe = document.getElementById('testFrame'); var iframe = document.getElementById('testFrame');