mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-12-31 03:52:01 +08:00
Cleanup fix for #962
This commit is contained in:
parent
b240c26667
commit
e4e12bdaa9
1 changed files with 2 additions and 34 deletions
36
vendors/squire/build/squire-raw.js
vendored
36
vendors/squire/build/squire-raw.js
vendored
|
@ -280,39 +280,7 @@ const
|
||||||
|
|
||||||
// Recursively examine container nodes and wrap any inline children.
|
// Recursively examine container nodes and wrap any inline children.
|
||||||
fixContainer = ( container, root ) => {
|
fixContainer = ( container, root ) => {
|
||||||
/*
|
|
||||||
// Live, but very slow
|
|
||||||
let children = container.childNodes;
|
|
||||||
let wrapper = null;
|
|
||||||
let i = 0, l = children.length, child, isBR;
|
|
||||||
|
|
||||||
for ( ; i < l; ++i ) {
|
|
||||||
child = children[i];
|
|
||||||
isBR = child.nodeName === 'BR';
|
|
||||||
if ( !isBR && isInline( child )
|
|
||||||
// && (root.__squire__._config.blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
|
|
||||||
) {
|
|
||||||
wrapper = wrapper || createElement( 'div' );
|
|
||||||
wrapper.append( child );
|
|
||||||
--i;
|
|
||||||
--l;
|
|
||||||
} else if ( isBR || wrapper ) {
|
|
||||||
wrapper = wrapper || createElement( 'div' );
|
|
||||||
fixCursor( wrapper, root );
|
|
||||||
if ( isBR ) {
|
|
||||||
child.replaceWith( wrapper );
|
|
||||||
} else {
|
|
||||||
child.before( wrapper );
|
|
||||||
++i;
|
|
||||||
++l;
|
|
||||||
}
|
|
||||||
wrapper = null;
|
|
||||||
}
|
|
||||||
isContainer( child ) && fixContainer( child, root );
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
let wrapper, isBR;
|
let wrapper, isBR;
|
||||||
// Not live, and fast
|
|
||||||
[...container.children].forEach(child => {
|
[...container.children].forEach(child => {
|
||||||
isBR = child.nodeName === 'BR';
|
isBR = child.nodeName === 'BR';
|
||||||
if ( !isBR && isInline( child )
|
if ( !isBR && isInline( child )
|
||||||
|
@ -323,10 +291,10 @@ const
|
||||||
} else if ( isBR || wrapper ) {
|
} else if ( isBR || wrapper ) {
|
||||||
wrapper = wrapper || createElement( 'div' );
|
wrapper = wrapper || createElement( 'div' );
|
||||||
fixCursor( wrapper, root );
|
fixCursor( wrapper, root );
|
||||||
isBR ? child.replaceWith( wrapper ) : child.before( wrapper );
|
child[isBR ? 'replaceWith' : 'before']( wrapper );
|
||||||
wrapper = null;
|
wrapper = null;
|
||||||
}
|
}
|
||||||
isContainer( child ) && fixContainer( child, root );
|
isContainer( child ) && fixContainer( child, root );
|
||||||
});
|
});
|
||||||
wrapper && container.append( fixCursor( wrapper, root ) );
|
wrapper && container.append( fixCursor( wrapper, root ) );
|
||||||
return container;
|
return container;
|
||||||
|
|
Loading…
Reference in a new issue