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 empty lines missing when copying plain text

Browse source
This commit is contained in:
Neil Jenkins 2017-01-09 10:35:19 +11:00
parent 918e252500
commit e645489f5f
5 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
build/squire-raw.js
View file

@ -2077,16 +2077,17 @@ var notWSTextNode = function ( node ) {
node.nodeName === 'BR' :
notWS.test( node.data );
};
var isLineBreak = function ( br ) {
var block = br.parentNode,
walker;
var isLineBreak = function ( br, isLBIfEmptyBlock ) {
var block = br.parentNode;
var walker;
while ( isInline( block ) ) {
block = block.parentNode;
}
walker = new TreeWalker(
block, SHOW_ELEMENT|SHOW_TEXT, notWSTextNode );
walker.currentNode = br;
return !!walker.nextNode();
return !!walker.nextNode() ||
( isLBIfEmptyBlock && !walker.previousNode() );
};
// <br> elements are treated specially, and differently depending on the
@ -2095,11 +2096,11 @@ var isLineBreak = function ( br ) {
// line breaks by wrapping the inline text in a <div>. Browsers that want <br>
// elements at the end of each block will then have them added back in a later
// fixCursor method call.
var cleanupBRs = function ( node, root ) {
var brs = node.querySelectorAll( 'BR' ),
brBreaksLine = [],
l = brs.length,
i, br, parent;
var cleanupBRs = function ( node, root, keepForBlankLine ) {
var brs = node.querySelectorAll( 'BR' );
var brBreaksLine = [];
var l = brs.length;
var i, br, parent;
// Must calculate whether the <br> breaks a line first, because if we
// have two <br>s next to each other, after the first one is converted
@ -2107,7 +2108,7 @@ var cleanupBRs = function ( node, root ) {
// therefore seem to not be a line break. But in its original context it
// was, so we should also convert it to a block split.
for ( i = 0; i < l; i += 1 ) {
brBreaksLine[i] = isLineBreak( brs[i] );
brBreaksLine[i] = isLineBreak( brs[i], keepForBlankLine );
}
while ( l-- ) {
br = brs[l];
@ -2136,7 +2137,7 @@ var setClipboardData = function ( clipboardData, node, root ) {
// Firefox will add an extra new line for BRs at the end of block when
// calculating innerText, even though they don't actually affect display.
// So we need to remove them first.
cleanupBRs( node, root );
cleanupBRs( node, root, true );
node.setAttribute( 'style',
'position:fixed;overflow:hidden;bottom:100%;right:100%;' );
@ -4004,7 +4005,7 @@ proto.setHTML = function ( html ) {
}
cleanTree( frag );
cleanupBRs( frag, root );
cleanupBRs( frag, root, false );
fixContainer( frag, root );
@ -4180,7 +4181,7 @@ proto.insertHTML = function ( html, isPaste ) {
addLinks( frag, frag, this );
cleanTree( frag );
cleanupBRs( frag, root );
cleanupBRs( frag, root, false );
removeEmptyInlines( frag );
frag.normalize();

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

21
source/Clean.js
View file

@ -307,16 +307,17 @@ var notWSTextNode = function ( node ) {
node.nodeName === 'BR' :
notWS.test( node.data );
};
var isLineBreak = function ( br ) {
var block = br.parentNode,
walker;
var isLineBreak = function ( br, isLBIfEmptyBlock ) {
var block = br.parentNode;
var walker;
while ( isInline( block ) ) {
block = block.parentNode;
}
walker = new TreeWalker(
block, SHOW_ELEMENT|SHOW_TEXT, notWSTextNode );
walker.currentNode = br;
return !!walker.nextNode();
return !!walker.nextNode() ||
( isLBIfEmptyBlock && !walker.previousNode() );
};
// <br> elements are treated specially, and differently depending on the
@ -325,11 +326,11 @@ var isLineBreak = function ( br ) {
// line breaks by wrapping the inline text in a <div>. Browsers that want <br>
// elements at the end of each block will then have them added back in a later
// fixCursor method call.
var cleanupBRs = function ( node, root ) {
var brs = node.querySelectorAll( 'BR' ),
brBreaksLine = [],
l = brs.length,
i, br, parent;
var cleanupBRs = function ( node, root, keepForBlankLine ) {
var brs = node.querySelectorAll( 'BR' );
var brBreaksLine = [];
var l = brs.length;
var i, br, parent;
// Must calculate whether the <br> breaks a line first, because if we
// have two <br>s next to each other, after the first one is converted
@ -337,7 +338,7 @@ var cleanupBRs = function ( node, root ) {
// therefore seem to not be a line break. But in its original context it
// was, so we should also convert it to a block split.
for ( i = 0; i < l; i += 1 ) {
brBreaksLine[i] = isLineBreak( brs[i] );
brBreaksLine[i] = isLineBreak( brs[i], keepForBlankLine );
}
while ( l-- ) {
br = brs[l];

2
source/Clipboard.js
View file

@ -10,7 +10,7 @@ var setClipboardData = function ( clipboardData, node, root ) {
// Firefox will add an extra new line for BRs at the end of block when
// calculating innerText, even though they don't actually affect display.
// So we need to remove them first.
cleanupBRs( node, root );
cleanupBRs( node, root, true );
node.setAttribute( 'style',
'position:fixed;overflow:hidden;bottom:100%;right:100%;' );

4
source/Editor.js
View file

@ -1592,7 +1592,7 @@ proto.setHTML = function ( html ) {
}
cleanTree( frag );
cleanupBRs( frag, root );
cleanupBRs( frag, root, false );
fixContainer( frag, root );
@ -1768,7 +1768,7 @@ proto.insertHTML = function ( html, isPaste ) {
addLinks( frag, frag, this );
cleanTree( frag );
cleanupBRs( frag, root );
cleanupBRs( frag, root, false );
removeEmptyInlines( frag );
frag.normalize();