X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fdom%2Frange.js;h=1aeac003fef1e1849619df7e8be5a7ca4aa8365f;hb=fb481ba0a7d298e3e7b9034fcb9f2afdc6e8e796;hp=30a78c4b31e83ba1b70deab99fa633533ec8f1ee;hpb=2f22c0c38f17e75be5541089076885442aaa2377;p=ckeditor.git
diff --git a/_source/core/dom/range.js b/_source/core/dom/range.js
index 30a78c4..1aeac00 100644
--- a/_source/core/dom/range.js
+++ b/_source/core/dom/range.js
@@ -347,35 +347,38 @@ CKEDITOR.dom.range = function( document )
// Creates the appropriate node evaluator for the dom walker used inside
// check(Start|End)OfBlock.
- function getCheckStartEndBlockEvalFunction( isStart )
+ function getCheckStartEndBlockEvalFunction()
{
- var hadBr = false, bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true );
+ var skipBogus = false,
+ whitespaces = CKEDITOR.dom.walker.whitespaces(),
+ bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true ),
+ isBogus = CKEDITOR.dom.walker.bogus();
+
return function( node )
{
- // First ignore bookmark nodes.
- if ( bookmarkEvaluator( node ) )
+ // First skip empty nodes.
+ if ( bookmarkEvaluator( node ) || whitespaces( node ) )
return true;
- if ( node.type == CKEDITOR.NODE_TEXT )
- {
- // If there's any visible text, then we're not at the start.
- if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )
- return false;
- }
- else if ( node.type == CKEDITOR.NODE_ELEMENT )
+ // Skip the bogus node at the end of block.
+ if ( isBogus( node ) &&
+ !skipBogus )
{
- // If there are non-empty inline elements (e.g. ), then we're not
- // at the start.
- if ( !inlineChildReqElements[ node.getName() ] )
- {
- // If we're working at the end-of-block, forgive the first
in non-IE
- // browsers.
- if ( !isStart && !CKEDITOR.env.ie && node.getName() == 'br' && !hadBr )
- hadBr = true;
- else
- return false;
- }
+ skipBogus = true;
+ return true;
}
+
+ // If there's any visible text, then we're not at the start.
+ if ( node.type == CKEDITOR.NODE_TEXT &&
+ ( node.hasAscendant( 'pre' ) ||
+ CKEDITOR.tools.trim( node.getText() ).length ) )
+ return false;
+
+ // If there are non-empty inline elements (e.g. ), then we're not
+ // at the start.
+ if ( node.type == CKEDITOR.NODE_ELEMENT && !inlineChildReqElements[ node.getName() ] )
+ return false;
+
return true;
};
}
@@ -386,21 +389,28 @@ CKEDITOR.dom.range = function( document )
// text node and non-empty elements unless it's being bookmark text.
function elementBoundaryEval( checkStart )
{
+ var whitespaces = CKEDITOR.dom.walker.whitespaces(),
+ bookmark = CKEDITOR.dom.walker.bookmark( 1 );
+
return function( node )
{
+ // First skip empty nodes.
+ if ( bookmark( node ) || whitespaces( node ) )
+ return true;
+
// Tolerant bogus br when checking at the end of block.
// Reject any text node unless it's being bookmark
// OR it's spaces.
// Reject any element unless it's being invisible empty. (#3883)
return !checkStart && isBogus( node ) ||
- ( node.type == CKEDITOR.NODE_TEXT ?
- !CKEDITOR.tools.trim( node.getText() ) || !!node.getParent().data( 'cke-bookmark' )
- : node.getName() in CKEDITOR.dtd.$removeEmpty );
+ node.type == CKEDITOR.NODE_ELEMENT &&
+ node.getName() in CKEDITOR.dtd.$removeEmpty;
};
}
var whitespaceEval = new CKEDITOR.dom.walker.whitespaces(),
- bookmarkEval = new CKEDITOR.dom.walker.bookmark();
+ bookmarkEval = new CKEDITOR.dom.walker.bookmark(),
+ nbspRegExp = /^[\t\r\n ]*(?: |\xa0)$/;
function nonWhitespaceOrBookmarkEval( node )
{
@@ -513,7 +523,7 @@ CKEDITOR.dom.range = function( document )
if ( serializable )
{
baseId = 'cke_bm_' + CKEDITOR.tools.getNextNumber();
- startNode.setAttribute( 'id', baseId + 'S' );
+ startNode.setAttribute( 'id', baseId + ( collapsed ? 'C' : 'S' ) );
}
// If collapsed, the endNode will not be created.
@@ -544,7 +554,7 @@ CKEDITOR.dom.range = function( document )
this.moveToPosition( startNode, CKEDITOR.POSITION_AFTER_END );
return {
- startNode : serializable ? baseId + 'S' : startNode,
+ startNode : serializable ? baseId + ( collapsed ? 'C' : 'S' ) : startNode,
endNode : serializable ? baseId + 'E' : endNode,
serializable : serializable,
collapsed : collapsed
@@ -1819,20 +1829,15 @@ CKEDITOR.dom.range = function( document )
var startContainer = this.startContainer,
startOffset = this.startOffset;
- // If the starting node is a text node, and non-empty before the offset,
- // then we're surely not at the start of block.
- if ( startOffset && startContainer.type == CKEDITOR.NODE_TEXT )
+ // [IE] Special handling for range start in text with a leading NBSP,
+ // we it to be isolated, for bogus check.
+ if ( CKEDITOR.env.ie && startOffset && startContainer.type == CKEDITOR.NODE_TEXT )
{
var textBefore = CKEDITOR.tools.ltrim( startContainer.substring( 0, startOffset ) );
- if ( textBefore.length )
- return false;
+ if ( nbspRegExp.test( textBefore ) )
+ this.trim( 0, 1 );
}
- // Antecipate the trim() call here, so the walker will not make
- // changes to the DOM, which would not get reflected into this
- // range otherwise.
- this.trim();
-
// We need to grab the block element holding the start boundary, so
// let's use an element path for it.
var path = new CKEDITOR.dom.elementPath( this.startContainer );
@@ -1843,7 +1848,7 @@ CKEDITOR.dom.range = function( document )
walkerRange.setStartAt( path.block || path.blockLimit, CKEDITOR.POSITION_AFTER_START );
var walker = new CKEDITOR.dom.walker( walkerRange );
- walker.evaluator = getCheckStartEndBlockEvalFunction( true );
+ walker.evaluator = getCheckStartEndBlockEvalFunction();
return walker.checkBackward();
},
@@ -1853,20 +1858,15 @@ CKEDITOR.dom.range = function( document )
var endContainer = this.endContainer,
endOffset = this.endOffset;
- // If the ending node is a text node, and non-empty after the offset,
- // then we're surely not at the end of block.
- if ( endContainer.type == CKEDITOR.NODE_TEXT )
+ // [IE] Special handling for range end in text with a following NBSP,
+ // we it to be isolated, for bogus check.
+ if ( CKEDITOR.env.ie && endContainer.type == CKEDITOR.NODE_TEXT )
{
var textAfter = CKEDITOR.tools.rtrim( endContainer.substring( endOffset ) );
- if ( textAfter.length )
- return false;
+ if ( nbspRegExp.test( textAfter ) )
+ this.trim( 1, 0 );
}
- // Antecipate the trim() call here, so the walker will not make
- // changes to the DOM, which would not get reflected into this
- // range otherwise.
- this.trim();
-
// We need to grab the block element holding the start boundary, so
// let's use an element path for it.
var path = new CKEDITOR.dom.elementPath( this.endContainer );
@@ -1877,15 +1877,53 @@ CKEDITOR.dom.range = function( document )
walkerRange.setEndAt( path.block || path.blockLimit, CKEDITOR.POSITION_BEFORE_END );
var walker = new CKEDITOR.dom.walker( walkerRange );
- walker.evaluator = getCheckStartEndBlockEvalFunction( false );
+ walker.evaluator = getCheckStartEndBlockEvalFunction();
return walker.checkForward();
},
/**
- * Check if elements at which the range boundaries anchor are read-only,
- * with respect to "contenteditable" attribute.
+ * Traverse with {@link CKEDITOR.dom.walker} to retrieve the previous element before the range start.
+ * @param {Function} evaluator Function used as the walker's evaluator.
+ * @param {Function} [guard] Function used as the walker's guard.
+ * @param {CKEDITOR.dom.element} [boundary] A range ancestor element in which the traversal is limited,
+ * default to the root editable if not defined.
+ *
+ * @return {CKEDITOR.dom.element|null} The returned node from the traversal.
+ */
+ getPreviousNode : function( evaluator, guard, boundary ) {
+
+ var walkerRange = this.clone();
+ walkerRange.collapse( 1 );
+ walkerRange.setStartAt( boundary || this.document.getBody(), CKEDITOR.POSITION_AFTER_START );
+
+ var walker = new CKEDITOR.dom.walker( walkerRange );
+ walker.evaluator = evaluator;
+ walker.guard = guard;
+ return walker.previous();
+ },
+
+ /**
+ * Traverse with {@link CKEDITOR.dom.walker} to retrieve the next element before the range start.
+ * @param {Function} evaluator Function used as the walker's evaluator.
+ * @param {Function} [guard] Function used as the walker's guard.
+ * @param {CKEDITOR.dom.element} [boundary] A range ancestor element in which the traversal is limited,
+ * default to the root editable if not defined.
+ *
+ * @return {CKEDITOR.dom.element|null} The returned node from the traversal.
*/
+ getNextNode: function( evaluator, guard, boundary )
+ {
+ var walkerRange = this.clone();
+ walkerRange.collapse();
+ walkerRange.setEndAt( boundary || this.document.getBody(), CKEDITOR.POSITION_BEFORE_END );
+
+ var walker = new CKEDITOR.dom.walker( walkerRange );
+ walker.evaluator = evaluator;
+ walker.guard = guard;
+ return walker.next();
+ },
+
checkReadOnly : ( function()
{
function checkNodesEditable( node, anotherEnd )
@@ -1938,12 +1976,8 @@ CKEDITOR.dom.range = function( document )
{
var next;
- if ( node.type == CKEDITOR.NODE_ELEMENT
- && node.isEditable( false )
- && !CKEDITOR.dtd.$nonEditable[ node.getName() ] )
- {
+ if ( node.type == CKEDITOR.NODE_ELEMENT && node.isEditable( false ) )
next = node[ isMoveToEnd ? 'getLast' : 'getFirst' ]( nonWhitespaceOrBookmarkEval );
- }
if ( !childOnly && !next )
next = node[ isMoveToEnd ? 'getPrevious' : 'getNext' ]( nonWhitespaceOrBookmarkEval );
@@ -1951,6 +1985,15 @@ CKEDITOR.dom.range = function( document )
return next;
}
+ // Handle non-editable element e.g. HR.
+ if ( el.type == CKEDITOR.NODE_ELEMENT && !el.isEditable( false ) )
+ {
+ this.moveToPosition( el, isMoveToEnd ?
+ CKEDITOR.POSITION_AFTER_END :
+ CKEDITOR.POSITION_BEFORE_START );
+ return true;
+ }
+
var found = 0;
while ( el )
@@ -1958,7 +2001,11 @@ CKEDITOR.dom.range = function( document )
// Stop immediately if we've found a text node.
if ( el.type == CKEDITOR.NODE_TEXT )
{
- this.moveToPosition( el, isMoveToEnd ?
+ // Put cursor before block filler.
+ if ( isMoveToEnd && this.checkEndOfBlock() && nbspRegExp.test( el.getText() ) )
+ this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+ else
+ this.moveToPosition( el, isMoveToEnd ?
CKEDITOR.POSITION_AFTER_END :
CKEDITOR.POSITION_BEFORE_START );
found = 1;
@@ -1975,6 +2022,9 @@ CKEDITOR.dom.range = function( document )
CKEDITOR.POSITION_AFTER_START );
found = 1;
}
+ // Put cursor before padding block br.
+ else if ( isMoveToEnd && el.is( 'br' ) && this.checkEndOfBlock() )
+ this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
}
el = nextDFS( el, found );