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

Update to latest squire

This commit is contained in:
Neil Jenkins 2016-11-02 14:50:33 +11:00
parent 76b8a06f77
commit bfbec71507
2 changed files with 8 additions and 5 deletions

View file

@ -3715,8 +3715,11 @@ var makeList = function ( self, frag, type ) {
listItemAttrs = tagAttributes.li; listItemAttrs = tagAttributes.li;
while ( node = walker.nextNode() ) { while ( node = walker.nextNode() ) {
tag = node.parentNode.nodeName; if ( node.parentNode.nodeName === 'LI' ) {
if ( tag !== 'LI' ) { node = node.parentNode;
walker.currentNode = node.lastChild;
}
if ( node.nodeName !== 'LI' ) {
newLi = self.createElement( 'LI', listItemAttrs ); newLi = self.createElement( 'LI', listItemAttrs );
if ( node.dir ) { if ( node.dir ) {
newLi.dir = node.dir; newLi.dir = node.dir;
@ -3739,7 +3742,7 @@ var makeList = function ( self, frag, type ) {
newLi.appendChild( empty( node ) ); newLi.appendChild( empty( node ) );
walker.currentNode = newLi; walker.currentNode = newLi;
} else { } else {
node = node.parentNode.parentNode; node = node.parentNode;
tag = node.nodeName; tag = node.nodeName;
if ( tag !== type && ( /^[OU]L$/.test( tag ) ) ) { if ( tag !== type && ( /^[OU]L$/.test( tag ) ) ) {
replaceWith( node, replaceWith( node,

File diff suppressed because one or more lines are too long