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

Ensure root node is never returned by get(Start|End)BlockOfRange

Browse source 
Fixes #237
This commit is contained in:
Neil Jenkins 2016-09-22 09:44:03 +01:00
parent e1d30b7082
commit 78b638f79b
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/squire-raw.js
View file

@ -1111,7 +1111,7 @@ var getStartBlockOfRange = function ( range, root ) {
// If inline, get the containing block.
if ( isInline( container ) ) {
block = getPreviousBlock( container, root );
} else if ( isBlock( container ) ) {
} else if ( container !== root && isBlock( container ) ) {
block = container;
} else {
block = getNodeBefore( container, range.startOffset );
@ -1130,7 +1130,7 @@ var getEndBlockOfRange = function ( range, root ) {
// If inline, get the containing block.
if ( isInline( container ) ) {
block = getPreviousBlock( container, root );
} else if ( isBlock( container ) ) {
} else if ( container !== root && isBlock( container ) ) {
block = container;
} else {
block = getNodeAfter( container, range.endOffset );

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

4
source/Range.js
View file

@ -419,7 +419,7 @@ var getStartBlockOfRange = function ( range, root ) {
// If inline, get the containing block.
if ( isInline( container ) ) {
block = getPreviousBlock( container, root );
} else if ( isBlock( container ) ) {
} else if ( container !== root && isBlock( container ) ) {
block = container;
} else {
block = getNodeBefore( container, range.startOffset );
@ -438,7 +438,7 @@ var getEndBlockOfRange = function ( range, root ) {
// If inline, get the containing block.
if ( isInline( container ) ) {
block = getPreviousBlock( container, root );
} else if ( isBlock( container ) ) {
} else if ( container !== root && isBlock( container ) ) {
block = container;
} else {
block = getNodeAfter( container, range.endOffset );