/*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
// check(Start|End)OfBlock.\r
function getCheckStartEndBlockEvalFunction( isStart )\r
{\r
- var hadBr = false, bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true );\r
+ var skipBogus = false,\r
+ bookmarkEvaluator = CKEDITOR.dom.walker.bookmark( true ),\r
+ nbspRegExp = /^[\t\r\n ]*(?: |\xa0)$/;\r
+\r
return function( node )\r
{\r
// First ignore bookmark nodes.\r
\r
if ( node.type == CKEDITOR.NODE_TEXT )\r
{\r
+ // Skip the block filler NBSP.\r
+ if ( CKEDITOR.env.ie &&\r
+ nbspRegExp.test( node.getText() ) &&\r
+ !skipBogus &&\r
+ !( isStart && node.getNext() ) )\r
+ {\r
+ skipBogus = true;\r
+ }\r
// If there's any visible text, then we're not at the start.\r
- if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )\r
+ else if ( node.hasAscendant( 'pre' ) || CKEDITOR.tools.trim( node.getText() ).length )\r
return false;\r
}\r
else if ( node.type == CKEDITOR.NODE_ELEMENT )\r
// at the start.\r
if ( !inlineChildReqElements[ node.getName() ] )\r
{\r
- // If we're working at the end-of-block, forgive the first <br /> in non-IE\r
- // browsers.\r
- if ( !isStart && !CKEDITOR.env.ie && node.getName() == 'br' && !hadBr )\r
- hadBr = true;\r
+ // Skip the padding block br.\r
+ if ( !CKEDITOR.env.ie &&\r
+ node.is( 'br' ) &&\r
+ !skipBogus &&\r
+ !( isStart && node.getNext() ) )\r
+ {\r
+ skipBogus = true;\r
+ }\r
else\r
return false;\r
}\r
};\r
}\r
\r
+\r
+ var isBogus = CKEDITOR.dom.walker.bogus();\r
// Evaluator for CKEDITOR.dom.element::checkBoundaryOfElement, reject any\r
// text node and non-empty elements unless it's being bookmark text.\r
- function elementBoundaryEval( node )\r
+ function elementBoundaryEval( checkStart )\r
{\r
- // Reject any text node unless it's being bookmark\r
- // OR it's spaces. (#3883)\r
- return node.type != CKEDITOR.NODE_TEXT\r
- && node.getName() in CKEDITOR.dtd.$removeEmpty\r
- || !CKEDITOR.tools.trim( node.getText() )\r
- || !!node.getParent().data( 'cke-bookmark' );\r
+ return function( node )\r
+ {\r
+ // Tolerant bogus br when checking at the end of block.\r
+ // Reject any text node unless it's being bookmark\r
+ // OR it's spaces.\r
+ // Reject any element unless it's being invisible empty. (#3883)\r
+ return !checkStart && isBogus( node ) ||\r
+ ( node.type == CKEDITOR.NODE_TEXT ?\r
+ !CKEDITOR.tools.trim( node.getText() ) || !!node.getParent().data( 'cke-bookmark' )\r
+ : node.getName() in CKEDITOR.dtd.$removeEmpty );\r
+ };\r
}\r
\r
var whitespaceEval = new CKEDITOR.dom.walker.whitespaces(),\r
if ( serializable )\r
{\r
baseId = 'cke_bm_' + CKEDITOR.tools.getNextNumber();\r
- startNode.setAttribute( 'id', baseId + 'S' );\r
+ startNode.setAttribute( 'id', baseId + ( collapsed ? 'C' : 'S' ) );\r
}\r
\r
// If collapsed, the endNode will not be created.\r
this.moveToPosition( startNode, CKEDITOR.POSITION_AFTER_END );\r
\r
return {\r
- startNode : serializable ? baseId + 'S' : startNode,\r
+ startNode : serializable ? baseId + ( collapsed ? 'C' : 'S' ) : startNode,\r
endNode : serializable ? baseId + 'E' : endNode,\r
serializable : serializable,\r
collapsed : collapsed\r
// whitespaces at the end.\r
isWhiteSpace = false;\r
\r
- if ( sibling.type == CKEDITOR.NODE_TEXT )\r
+ if ( sibling.type == CKEDITOR.NODE_COMMENT )\r
+ {\r
+ sibling = sibling.getPrevious();\r
+ continue;\r
+ }\r
+ else if ( sibling.type == CKEDITOR.NODE_TEXT )\r
{\r
siblingText = sibling.getText();\r
\r
sibling = null;\r
else\r
{\r
- var allChildren = sibling.$.all || sibling.$.getElementsByTagName( '*' );\r
+ var allChildren = sibling.$.getElementsByTagName( '*' );\r
for ( var i = 0, child ; child = allChildren[ i++ ] ; )\r
{\r
if ( !CKEDITOR.dtd.$removeEmpty[ child.nodeName.toLowerCase() ] )\r
\r
isWhiteSpace = /^[\s\ufeff]/.test( siblingText );\r
}\r
- else\r
+ else if ( sibling.type == CKEDITOR.NODE_ELEMENT )\r
{\r
// If this is a visible element.\r
// We need to check for the bookmark attribute because IE insists on\r
sibling = null;\r
else\r
{\r
- allChildren = sibling.$.all || sibling.$.getElementsByTagName( '*' );\r
+ allChildren = sibling.$.getElementsByTagName( '*' );\r
for ( i = 0 ; child = allChildren[ i++ ] ; )\r
{\r
if ( !CKEDITOR.dtd.$removeEmpty[ child.nodeName.toLowerCase() ] )\r
sibling = null;\r
}\r
}\r
+ else\r
+ isWhiteSpace = 1;\r
\r
if ( isWhiteSpace )\r
{\r
// Create the walker, which will check if we have anything useful\r
// in the range.\r
var walker = new CKEDITOR.dom.walker( walkerRange );\r
- walker.evaluator = elementBoundaryEval;\r
+ walker.evaluator = elementBoundaryEval( checkStart );\r
\r
return walker[ checkStart ? 'checkBackward' : 'checkForward' ]();\r
},\r
return false;\r
}\r
\r
- // Antecipate the trim() call here, so the walker will not make\r
- // changes to the DOM, which would not get reflected into this\r
- // range otherwise.\r
- this.trim();\r
-\r
// We need to grab the block element holding the start boundary, so\r
// let's use an element path for it.\r
var path = new CKEDITOR.dom.elementPath( this.startContainer );\r
return false;\r
}\r
\r
- // Antecipate the trim() call here, so the walker will not make\r
- // changes to the DOM, which would not get reflected into this\r
- // range otherwise.\r
- this.trim();\r
-\r
// We need to grab the block element holding the start boundary, so\r
// let's use an element path for it.\r
var path = new CKEDITOR.dom.elementPath( this.endContainer );\r
*/\r
moveToElementEditablePosition : function( el, isMoveToEnd )\r
{\r
+ var nbspRegExp = /^[\t\r\n ]*(?: |\xa0)$/;\r
+\r
function nextDFS( node, childOnly )\r
{\r
var next;\r
\r
- if ( node.type == CKEDITOR.NODE_ELEMENT\r
- && node.isEditable( false )\r
- && !CKEDITOR.dtd.$nonEditable[ node.getName() ] )\r
- {\r
+ if ( node.type == CKEDITOR.NODE_ELEMENT && node.isEditable( false ) )\r
next = node[ isMoveToEnd ? 'getLast' : 'getFirst' ]( nonWhitespaceOrBookmarkEval );\r
- }\r
\r
if ( !childOnly && !next )\r
next = node[ isMoveToEnd ? 'getPrevious' : 'getNext' ]( nonWhitespaceOrBookmarkEval );\r
return next;\r
}\r
\r
+ // Handle non-editable element e.g. HR.\r
+ if ( el.type == CKEDITOR.NODE_ELEMENT && !el.isEditable( false ) )\r
+ {\r
+ this.moveToPosition( el, isMoveToEnd ?\r
+ CKEDITOR.POSITION_AFTER_END :\r
+ CKEDITOR.POSITION_BEFORE_START );\r
+ return true;\r
+ }\r
+\r
var found = 0;\r
\r
while ( el )\r
// Stop immediately if we've found a text node.\r
if ( el.type == CKEDITOR.NODE_TEXT )\r
{\r
- this.moveToPosition( el, isMoveToEnd ?\r
+ // Put cursor before block filler.\r
+ if ( isMoveToEnd && this.checkEndOfBlock() && nbspRegExp.test( el.getText() ) )\r
+ this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );\r
+ else\r
+ this.moveToPosition( el, isMoveToEnd ?\r
CKEDITOR.POSITION_AFTER_END :\r
CKEDITOR.POSITION_BEFORE_START );\r
found = 1;\r
CKEDITOR.POSITION_AFTER_START );\r
found = 1;\r
}\r
+ // Put cursor before padding block br.\r
+ else if ( isMoveToEnd && el.is( 'br' ) && this.checkEndOfBlock() )\r
+ this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );\r
}\r
\r
el = nextDFS( el, found );\r
Got questions, comments, patches, etc.? Contact Jason Woofenden