Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2025-02-23 07:15:50 -05:00
Code Issues Activity

Tidy Clean.js file layout

Browse source
This commit is contained in:
Neil Jenkins 2015-06-19 09:59:44 +07:00
parent c3701ba026
commit 926f40d033
3 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
build/squire-raw.js
View file

@ -1713,23 +1713,6 @@ var stylesRewriters = {
}
};
var removeEmptyInlines = function ( root ) {
var children = root.childNodes,
l = children.length,
child;
while ( l-- ) {
child = children[l];
if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
removeEmptyInlines( child );
if ( isInline( child ) && !child.firstChild ) {
root.removeChild( child );
}
} else if ( child.nodeType === TEXT_NODE && !child.data ) {
root.removeChild( child );
}
}
};
/*
Two purposes:
@ -1813,6 +1796,27 @@ var cleanTree = function ( node, allowStyles ) {
return node;
};
// ---
var removeEmptyInlines = function removeEmptyInlines ( root ) {
var children = root.childNodes,
l = children.length,
child;
while ( l-- ) {
child = children[l];
if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
removeEmptyInlines( child );
if ( isInline( child ) && !child.firstChild ) {
root.removeChild( child );
}
} else if ( child.nodeType === TEXT_NODE && !child.data ) {
root.removeChild( child );
}
}
};
// ---
var notWSTextNode = function ( node ) {
return node.nodeType === ELEMENT_NODE ?
node.nodeName === 'BR' :
@ -1833,10 +1837,9 @@ var isLineBreak = function ( br ) {
// <br> elements are treated specially, and differently depending on the
// browser, when in rich text editor mode. When adding HTML from external
// sources, we must remove them, replacing the ones that actually affect
// line breaks with a split of the block element containing it (and wrapping
// any not inside a block). Browsers that want <br> elements at the end of
// each block will then have them added back in a later fixCursor method
// call.
// 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 ( root ) {
var brs = root.querySelectorAll( 'BR' ),
brBreaksLine = [],

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

45
source/Clean.js
View file

@ -165,23 +165,6 @@ var stylesRewriters = {
}
};
var removeEmptyInlines = function ( root ) {
var children = root.childNodes,
l = children.length,
child;
while ( l-- ) {
child = children[l];
if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
removeEmptyInlines( child );
if ( isInline( child ) && !child.firstChild ) {
root.removeChild( child );
}
} else if ( child.nodeType === TEXT_NODE && !child.data ) {
root.removeChild( child );
}
}
};
/*
Two purposes:
@ -265,6 +248,27 @@ var cleanTree = function ( node, allowStyles ) {
return node;
};
// ---
var removeEmptyInlines = function removeEmptyInlines ( root ) {
var children = root.childNodes,
l = children.length,
child;
while ( l-- ) {
child = children[l];
if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
removeEmptyInlines( child );
if ( isInline( child ) && !child.firstChild ) {
root.removeChild( child );
}
} else if ( child.nodeType === TEXT_NODE && !child.data ) {
root.removeChild( child );
}
}
};
// ---
var notWSTextNode = function ( node ) {
return node.nodeType === ELEMENT_NODE ?
node.nodeName === 'BR' :
@ -285,10 +289,9 @@ var isLineBreak = function ( br ) {
// <br> elements are treated specially, and differently depending on the
// browser, when in rich text editor mode. When adding HTML from external
// sources, we must remove them, replacing the ones that actually affect
// line breaks with a split of the block element containing it (and wrapping
// any not inside a block). Browsers that want <br> elements at the end of
// each block will then have them added back in a later fixCursor method
// call.
// 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 ( root ) {
var brs = root.querySelectorAll( 'BR' ),
brBreaksLine = [],