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

Bugfix: Squire setHTML failed with hidden exception

Browse source
This commit is contained in:
djmaze 2020-09-22 15:03:14 +02:00
parent 843b186354
commit 996c747e45
3 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -304,17 +304,15 @@ const
// Recursively examine container nodes and wrap any inline children.
fixContainer = ( container, root ) => {
let children = container.childNodes;
let children = container.children;
let wrapper = null;
let i, l, child, isBR;
for ( i = 0, l = children.length; i < l; ++i ) {
child = children[i];
isBR = child.nodeName === 'BR';
if ( !isBR && isInline( child ) && (
config.blockTag !== 'DIV' ||
!phrasingContentElements.matches(phrasingElements)
)
if ( !isBR && isInline( child )
&& (this._config.blockTag !== 'DIV' || !child.matches(phrasingElements))
) {
if ( !wrapper ) {
wrapper = createElement( doc, 'div' );
@ -340,6 +338,34 @@ const
fixContainer( child, root );
}
}
/*
// Not live
[...container.children].forEach(child => {
isBR = child.nodeName === 'BR';
if ( !isBR && isInline( child )
&& (root.__squire__._config.blockTag !== 'DIV' || !child.matches(phrasingElements))
) {
if ( !wrapper ) {
wrapper = createElement( doc, 'div' );
}
wrapper.append( child );
} else if ( isBR || wrapper ) {
if ( !wrapper ) {
wrapper = createElement( doc, 'div' );
}
fixCursor( wrapper, root );
if ( isBR ) {
child.replaceWith( wrapper );
} else {
child.before( wrapper );
}
wrapper = null;
}
if ( isContainer( child ) ) {
fixContainer( child, root );
}
});
*/
if ( wrapper ) {
container.append( fixCursor( wrapper, root ) );
}

1
vendors/squire/build/squire.js vendored
View file

File diff suppressed because one or more lines are too long