X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fcore%2Fdom%2Frange.js;h=8d30b4fe2bc7ff4afbba7347c3b0899a16cebb63;hb=c6e377a02b54abc07129d72b632763c727476a15;hp=a8b102d933599d5a5f332b7df784b4633457b9e1;hpb=7cd80714081a8ffdf4a1a8d2c72f120ed5ef3d6d;p=ckeditor.git

diff --git a/_source/core/dom/range.js b/_source/core/dom/range.js
index a8b102d..8d30b4f 100644
--- a/_source/core/dom/range.js
+++ b/_source/core/dom/range.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -133,7 +133,7 @@ CKEDITOR.dom.range = function( document )
 
 			currentNode = levelStartNode.getNext();
 
-			while( currentNode )
+			while ( currentNode )
 			{
 				// Stop processing when the current node matches a node in the
 				// endParents tree or if it is the endNode.
@@ -180,7 +180,7 @@ CKEDITOR.dom.range = function( document )
 			{
 				currentNode = levelStartNode.getPrevious();
 
-				while( currentNode )
+				while ( currentNode )
 				{
 					// Stop processing when the current node matches a node in the
 					// startParents tree or if it is the startNode.
@@ -252,10 +252,10 @@ CKEDITOR.dom.range = function( document )
 		}
 
 		// Cleanup any marked node.
-		if( removeStartNode )
+		if ( removeStartNode )
 			startNode.remove();
 
-		if( removeEndNode && endNode.$.parentNode )
+		if ( removeEndNode && endNode.$.parentNode )
 			endNode.remove();
 	};
 
@@ -278,7 +278,7 @@ CKEDITOR.dom.range = function( document )
 				if ( CKEDITOR.tools.trim( node.getText() ).length )
 					return false;
 				}
-			else if( node.type == CKEDITOR.NODE_ELEMENT )
+			else if ( node.type == CKEDITOR.NODE_ELEMENT )
 			{
 				// If there are non-empty inline elements (e.g. <img />), then we're not
 				// at the start.
@@ -742,15 +742,21 @@ CKEDITOR.dom.range = function( document )
 
 					startOffset = startContainer.getIndex() + 1;
 					startContainer = startContainer.getParent();
-					// Check if it is necessary to update the end boundary.
-					if ( !collapsed && this.startContainer.equals( this.endContainer ) )
+
+					// Check all necessity of updating the end boundary.
+					if ( this.startContainer.equals( this.endContainer ) )
 						this.setEnd( nextText, this.endOffset - this.startOffset );
+					else if ( startContainer.equals( this.endContainer ) )
+						this.endOffset += 1;
 				}
 
 				this.setStart( startContainer, startOffset );
 
 				if ( collapsed )
+				{
 					this.collapse( true );
+					return;
+				}
 			}
 
 			var endContainer = this.endContainer;
@@ -1468,6 +1474,7 @@ CKEDITOR.dom.range = function( document )
 				else
 				{
 					endBlock = this.splitElement( startBlock );
+
 					// In Gecko, the last child node must be a bogus <br>.
 					// Note: bogus <br> added under <ul> or <ol> would cause
 					// lists to be incorrectly rendered.
@@ -1604,14 +1611,15 @@ CKEDITOR.dom.range = function( document )
 		},
 
 		/**
-		 * Moves the range boundaries to the first editing point inside an
+		 * Moves the range boundaries to the first/end editing point inside an
 		 * element. For example, in an element tree like
 		 * "&lt;p&gt;&lt;b&gt;&lt;i&gt;&lt;/i&gt;&lt;/b&gt; Text&lt;/p&gt;", the start editing point is
 		 * "&lt;p&gt;&lt;b&gt;&lt;i&gt;^&lt;/i&gt;&lt;/b&gt; Text&lt;/p&gt;" (inside &lt;i&gt;).
 		 * @param {CKEDITOR.dom.element} el The element into which look for the
 		 *		editing spot.
+		 * @param {Boolean} isMoveToEnd Whether move to the end editable position.
 		 */
-		moveToElementEditStart : function( el )
+		moveToElementEditablePosition : function( el, isMoveToEnd )
 		{
 			var isEditable;
 
@@ -1621,24 +1629,30 @@ CKEDITOR.dom.range = function( document )
 
 				// If an editable element is found, move inside it.
 				if ( isEditable )
-					this.moveToPosition( el, CKEDITOR.POSITION_AFTER_START );
+					this.moveToPosition( el, isMoveToEnd ?
+					                         CKEDITOR.POSITION_BEFORE_END :
+					                         CKEDITOR.POSITION_AFTER_START );
 				// Stop immediately if we've found a non editable inline element (e.g <img>).
 				else if ( CKEDITOR.dtd.$inline[ el.getName() ] )
 				{
-					this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+					this.moveToPosition( el, isMoveToEnd ?
+					                         CKEDITOR.POSITION_AFTER_END :
+					                         CKEDITOR.POSITION_BEFORE_START );
 					return true;
 				}
 
 				// Non-editable non-inline elements are to be bypassed, getting the next one.
 				if ( CKEDITOR.dtd.$empty[ el.getName() ] )
-					el = el.getNext( nonWhitespaceOrBookmarkEval );
+					el = el[ isMoveToEnd ? 'getPrevious' : 'getNext' ]( nonWhitespaceOrBookmarkEval );
 				else
-					el = el.getFirst( nonWhitespaceOrBookmarkEval );
+					el = el[ isMoveToEnd ? 'getLast' : 'getFirst' ]( nonWhitespaceOrBookmarkEval );
 
 				// Stop immediately if we've found a text node.
 				if ( el && el.type == CKEDITOR.NODE_TEXT )
 				{
-					this.moveToPosition( el, CKEDITOR.POSITION_BEFORE_START );
+					this.moveToPosition( el, isMoveToEnd ?
+					                         CKEDITOR.POSITION_AFTER_END :
+					                         CKEDITOR.POSITION_BEFORE_START );
 					return true;
 				}
 			}
@@ -1647,6 +1661,22 @@ CKEDITOR.dom.range = function( document )
 		},
 
 		/**
+		 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
+		 */
+		moveToElementEditStart : function( target )
+		{
+			return this.moveToElementEditablePosition( target );
+		},
+
+		/**
+		 *@see {CKEDITOR.dom.range.moveToElementEditablePosition}
+		 */
+		moveToElementEditEnd : function( target )
+		{
+			return this.moveToElementEditablePosition( target, true );
+		},
+
+		/**
 		 * Get the single node enclosed within the range if there's one.
 		 */
 		getEnclosedNode : function()