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

Ensure range is valid after Range#_deleteContents.

Browse source
This commit is contained in:
Neil Jenkins 2011-11-02 18:46:18 +11:00
parent ae09554883
commit a91df2db4c
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
source/Range.js
View file

@ -137,6 +137,15 @@ implement( Range, {
this.selectNodeContents( startBlock ); this.selectNodeContents( startBlock );
} }
// Ensure valid range (must have only block or inline containers)
var isCollapsed = this.collapsed;
this.moveBoundariesDownTree();
if ( isCollapsed ) {
// Hopefully at least start or end is now a text node.
// Make that the focus point.
this.collapse( this.startContainer.nodeType === TEXT_NODE );
}
return this; return this;
}, },
@ -223,7 +232,7 @@ implement( Range, {
var range = this, var range = this,
nodeRange = node.ownerDocument.createRange(); nodeRange = node.ownerDocument.createRange();
nodeRange.selectNodeContents( node ); nodeRange.selectNode( node );
if ( partial ) { if ( partial ) {
// Node must not finish before range starts or start after range // Node must not finish before range starts or start after range
@ -323,14 +332,11 @@ implement( Range, {
return this; return this;
}, },
// Returns the first block at least partially contained by the range, getFirstNodeAfterStart: function () {
// or null if no block is contained by the range. var node = this.startContainer;
getStartBlock: function () {
// 1. Find first node after range start.
var node = this.startContainer,
offset = this.startOffset,
children = node.childNodes;
if ( node.nodeType === ELEMENT_NODE ) { if ( node.nodeType === ELEMENT_NODE ) {
var offset = this.startOffset,
children = node.childNodes;
if ( offset < children.length ) { if ( offset < children.length ) {
node = children[ offset ]; node = children[ offset ];
} else { } else {
@ -340,6 +346,26 @@ implement( Range, {
if ( node ) { node = node.nextSibling; } if ( node ) { node = node.nextSibling; }
} }
} }
return node;
},
getLastNodeBeforeEnd: function () {
var node = this.endContainer,
offset = this.startOffset,
children = node.childNodes;
while ( offset && node.nodeType === ELEMENT_NODE ) {
node = children[ offset - 1 ];
children = node.childNodes;
offset = children.length;
}
return node;
},
// Returns the first block at least partially contained by the range,
// or null if no block is contained by the range.
getStartBlock: function () {
// 1. Find first node after range start.
var node = this.getFirstNodeAfterStart();
// 2. If not a block, get previous block. // 2. If not a block, get previous block.
if ( node && !node.isBlock() ) { if ( node && !node.isBlock() ) {
node = node.getPreviousBlock(); node = node.getPreviousBlock();
@ -352,16 +378,9 @@ implement( Range, {
// or null if no block is contained by the range. // or null if no block is contained by the range.
getEndBlock: function () { getEndBlock: function () {
// 1. Find first node before range end. // 1. Find first node before range end.
var node = this.endContainer, var node = this.getLastNodeBeforeEnd();
offset = this.startOffset,
children = node.childNodes;
while ( offset && node.nodeType === ELEMENT_NODE ) {
node = children[ offset - 1 ];
children = node.childNodes;
offset = children.length;
}
// 2. If not a block, get previous block. // 2. If not a block, get previous block.
if ( !node.isBlock() ) { if ( node && !node.isBlock() ) {
node = node.getPreviousBlock(); node = node.getPreviousBlock();
} }
// 3. Check the block does not end before range ends. // 3. Check the block does not end before range ends.