Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squire remove brBreaksLine test

Browse source
This commit is contained in:
the-djmaze 2022-02-11 11:27:30 +01:00
parent e0e490c64f
commit 16c7fdaf3b
1 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
vendors/squire/build/squire-raw.js vendored
View file

@ -1597,18 +1597,8 @@ const
// fixCursor method call. // fixCursor method call.
cleanupBRs = ( node, root, keepForBlankLine ) => { cleanupBRs = ( node, root, keepForBlankLine ) => {
let brs = node.querySelectorAll( 'BR' ); let brs = node.querySelectorAll( 'BR' );
let brBreaksLine = [];
let l = brs.length; let l = brs.length;
let i, br, parent; let 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
// to a block split, the second will be at the end of a block and
// 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 ) {
brBreaksLine[i] = isLineBreak( brs[i], keepForBlankLine );
}
while ( l-- ) { while ( l-- ) {
br = brs[l]; br = brs[l];
// Cleanup may have removed it // Cleanup may have removed it
@ -1618,7 +1608,7 @@ const
// anything useful. We'll add it back later if required by the // anything useful. We'll add it back later if required by the
// browser. If it breaks a line, wrap the content in div tags // browser. If it breaks a line, wrap the content in div tags
// and replace the brs. // and replace the brs.
if ( !brBreaksLine[l] ) { if ( !isLineBreak( br, keepForBlankLine ) ) {
detach( br ); detach( br );
} else if ( !isInline( parent ) ) { } else if ( !isInline( parent ) ) {
fixContainer( parent, root ); fixContainer( parent, root );
@ -4010,21 +4000,12 @@ class Squire
while (( node = walker.nextNode() )) { while (( node = walker.nextNode() )) {
// 2. Replace <br> with \n in content // 2. Replace <br> with \n in content
let nodes = node.querySelectorAll( 'BR' ); let nodes = node.querySelectorAll( 'BR' );
let brBreaksLine = [];
let l = nodes.length; let l = nodes.length;
let i, br; let br;
// 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
// to a block split, the second will be at the end of a block and
// 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 ) {
brBreaksLine[i] = isLineBreak( nodes[i], false );
}
while ( l-- ) { while ( l-- ) {
br = nodes[l]; br = nodes[l];
if ( !brBreaksLine[l] ) { if ( !isLineBreak( br, false ) ) {
detach( br ); detach( br );
} else { } else {
br.replaceWith( doc.createTextNode( '\n' ) ); br.replaceWith( doc.createTextNode( '\n' ) );