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

Squire: Fix possible error when deleting range

Browse source
This commit is contained in:
Neil Jenkins 2016-04-07 13:08:45 +10:00
parent d9122222b2
commit 66c0b20702
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/squire-raw.js
View file

@ -361,6 +361,10 @@ function fixCursor ( node, root ) {
} }
} }
if ( node.nodeType === TEXT_NODE ) {
return originalNode;
}
if ( isInline( node ) ) { if ( isInline( node ) ) {
child = node.firstChild; child = node.firstChild;
while ( cantFocusEmptyTextNodes && child && while ( cantFocusEmptyTextNodes && child &&
@ -806,8 +810,8 @@ var deleteContentsOfRange = function ( range, root ) {
moveRangeBoundariesDownTree( range ); moveRangeBoundariesDownTree( range );
// If we split into two different blocks, merge the blocks. // If we split into two different blocks, merge the blocks.
if ( needsMerge ) {
startBlock = getStartBlockOfRange( range, root ); startBlock = getStartBlockOfRange( range, root );
if ( needsMerge ) {
endBlock = getEndBlockOfRange( range, root ); endBlock = getEndBlockOfRange( range, root );
if ( startBlock && endBlock && startBlock !== endBlock ) { if ( startBlock && endBlock && startBlock !== endBlock ) {
mergeWithBlock( startBlock, endBlock, range ); mergeWithBlock( startBlock, endBlock, range );

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

4
source/Node.js
View file

@ -190,6 +190,10 @@ function fixCursor ( node, root ) {
} }
} }
if ( node.nodeType === TEXT_NODE ) {
return originalNode;
}
if ( isInline( node ) ) { if ( isInline( node ) ) {
child = node.firstChild; child = node.firstChild;
while ( cantFocusEmptyTextNodes && child && while ( cantFocusEmptyTextNodes && child &&

2
source/Range.js
View file

@ -153,8 +153,8 @@ var deleteContentsOfRange = function ( range, root ) {
moveRangeBoundariesDownTree( range ); moveRangeBoundariesDownTree( range );
// If we split into two different blocks, merge the blocks. // If we split into two different blocks, merge the blocks.
if ( needsMerge ) {
startBlock = getStartBlockOfRange( range, root ); startBlock = getStartBlockOfRange( range, root );
if ( needsMerge ) {
endBlock = getEndBlockOfRange( range, root ); endBlock = getEndBlockOfRange( range, root );
if ( startBlock && endBlock && startBlock !== endBlock ) { if ( startBlock && endBlock && startBlock !== endBlock ) {
mergeWithBlock( startBlock, endBlock, range ); mergeWithBlock( startBlock, endBlock, range );