Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 15:23:29 -05:00
Code Issues Activity

Don't trim whitespace if inside another inline node.

Browse source
This commit is contained in:
Neil Jenkins 2014-05-27 11:36:50 +10:00
parent aca8fd4fab
commit 34d3839ceb
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/squire-raw.js
View file

@ -2460,6 +2460,11 @@ var cleanTree = function ( node, allowStyles ) {
// which are just nbsp, in order to cleanup <div>nbsp<br></div> // which are just nbsp, in order to cleanup <div>nbsp<br></div>
// construct. // construct.
if ( /\S/.test( data ) ) { if ( /\S/.test( data ) ) {
// If the parent node is inline, don't trim this node as
// it probably isn't at the end of the block.
if ( isInline( node ) ) {
continue;
}
j = 0; j = 0;
ll = data.length; ll = data.length;
if ( !i || !isInline( children[ i - 1 ] ) ) { if ( !i || !isInline( children[ i - 1 ] ) ) {

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

5
source/Editor.js
View file

@ -1348,6 +1348,11 @@ var cleanTree = function ( node, allowStyles ) {
// which are just nbsp, in order to cleanup <div>nbsp<br></div> // which are just nbsp, in order to cleanup <div>nbsp<br></div>
// construct. // construct.
if ( /\S/.test( data ) ) { if ( /\S/.test( data ) ) {
// If the parent node is inline, don't trim this node as
// it probably isn't at the end of the block.
if ( isInline( node ) ) {
continue;
}
j = 0; j = 0;
ll = data.length; ll = data.length;
if ( !i || !isInline( children[ i - 1 ] ) ) { if ( !i || !isInline( children[ i - 1 ] ) ) {