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

Fix bug in Range#insertTreeFragment

Browse source 
Merging containers could remove the nodeAfterSplit from the tree, which then
caused an error to be thrown if it had no content, as the code would try to
remove it again.
This commit is contained in:
Neil Jenkins 2013-01-30 11:30:11 +11:00
parent 775b72ec88
commit b35b7d4b35
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

32
source/Range.js
View file

@ -1,6 +1,6 @@
/* Copyright © 2011-2012 by Neil Jenkins. Licensed under the MIT license. */
/*global Range, Node, DOMTreeWalker */
/*global Range, DOMTreeWalker */
( function ( TreeWalker ) {
@ -268,30 +268,32 @@ var RangePrototypeExtensions = {
endOffset += 1;
}
// Fix cursor before inserting block:
// Fix cursor then insert block(s)
node = frag;
while ( node = node.getNextBlock() ) {
node.fixCursor();
}
parent.insertBefore( frag, nodeAfterSplit );
// Merge containers at edges
nodeAfterSplit.mergeContainers();
nodeBeforeSplit.nextSibling.mergeContainers();
// Remove empty nodes created by split.
if ( nodeAfterSplit === endContainer &&
!endContainer.textContent ) {
endContainer = endContainer.previousSibling;
endOffset = endContainer.getLength();
// Remove empty nodes created by split and merge inserted containers
// with edges of split
node = nodeAfterSplit.previousSibling;
if ( !nodeAfterSplit.textContent ) {
parent.removeChild( nodeAfterSplit );
} else {
nodeAfterSplit.mergeContainers();
}
if ( nodeBeforeSplit === startContainer &&
!startContainer.textContent) {
startContainer = startContainer.nextSibling;
if ( !nodeAfterSplit.parentNode ) {
endContainer = node;
endOffset = endContainer.getLength();
}
if ( !nodeBeforeSplit.textContent) {
startContainer = nodeBeforeSplit.nextSibling;
startOffset = 0;
parent.removeChild( nodeBeforeSplit );
} else {
nodeBeforeSplit.mergeContainers();
}
this.setStart( startContainer, startOffset );