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

Restore range more accurately from bookmark

Browse source
This commit is contained in:
Neil Jenkins 2016-03-30 16:39:04 +11:00
parent ed44d72ca7
commit d9122222b2
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/squire-raw.js
View file

@ -2819,9 +2819,21 @@ proto._getRangeAndRemoveBookmark = function ( range ) {
range.setEnd( _range.endContainer, _range.endOffset );
collapsed = range.collapsed;
moveRangeBoundariesDownTree( range );
// If we didn't split a text node, we should move into any adjacent
// text node to current selection point
if ( collapsed ) {
range.collapse( true );
startContainer = range.startContainer;
if ( startContainer.nodeType === TEXT_NODE ) {
endContainer = startContainer.childNodes[ range.startOffset ];
if ( !endContainer || endContainer.nodeType !== TEXT_NODE ) {
endContainer =
startContainer.childNodes[ range.startOffset - 1 ];
}
if ( endContainer && endContainer.nodeType === TEXT_NODE ) {
range.setStart( endContainer, 0 );
range.collapse( true );
}
}
}
}
return range || null;

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

16
source/Editor.js
View file

@ -613,9 +613,21 @@ proto._getRangeAndRemoveBookmark = function ( range ) {
range.setEnd( _range.endContainer, _range.endOffset );
collapsed = range.collapsed;
moveRangeBoundariesDownTree( range );
// If we didn't split a text node, we should move into any adjacent
// text node to current selection point
if ( collapsed ) {
range.collapse( true );
startContainer = range.startContainer;
if ( startContainer.nodeType === TEXT_NODE ) {
endContainer = startContainer.childNodes[ range.startOffset ];
if ( !endContainer || endContainer.nodeType !== TEXT_NODE ) {
endContainer =
startContainer.childNodes[ range.startOffset - 1 ];
}
if ( endContainer && endContainer.nodeType === TEXT_NODE ) {
range.setStart( endContainer, 0 );
range.collapse( true );
}
}
}
}
return range || null;