X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fdomiterator%2Fplugin.js;h=5c092bba559b7efa8509ac066373cc56f1cb7ae6;hb=4e90e78dc97789709ee7404359a5517540c27553;hp=f0b18357659138979c2f5c292ff6d93d26e7a66e;hpb=c9fdde67e6384bd5a66adc2b3bba5c4ce9db56c7;p=ckeditor.git

diff --git a/_source/plugins/domiterator/plugin.js b/_source/plugins/domiterator/plugin.js
index f0b1835..5c092bb 100644
--- a/_source/plugins/domiterator/plugin.js
+++ b/_source/plugins/domiterator/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -20,17 +20,29 @@ CKEDITOR.plugins.add( 'domiterator' );
 			return;
 
 		this.range = range;
-		this.forceBrBreak = false;
+		this.forceBrBreak = 0;
 
 		// Whether include <br>s into the enlarged range.(#3730).
-		this.enlargeBr = true;
-		this.enforceRealBlocks = false;
+		this.enlargeBr = 1;
+		this.enforceRealBlocks = 0;
 
 		this._ || ( this._ = {} );
 	}
 
 	var beginWhitespaceRegex = /^[\r\n\t ]+$/,
-		isBookmark = CKEDITOR.dom.walker.bookmark();
+		// Ignore bookmark nodes.(#3783)
+		bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true ),
+		whitespacesGuard = CKEDITOR.dom.walker.whitespaces( true ),
+		skipGuard = function( node ) { return bookmarkGuard( node ) && whitespacesGuard( node ); };
+
+	// Get a reference for the next element, bookmark nodes are skipped.
+	function getNextSourceNode( node, startFromSibling, lastNode )
+	{
+		var next = node.getNextSourceNode( startFromSibling, null, lastNode );
+		while ( !bookmarkGuard( next ) )
+			next = next.getNextSourceNode( startFromSibling, null, lastNode );
+		return next;
+	}
 
 	iterator.prototype = {
 		getNextParagraph : function( blockTag )
@@ -80,7 +92,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 				// next block.(#3887)
 				if ( this._.lastNode &&
 						this._.lastNode.type == CKEDITOR.NODE_TEXT &&
-						!CKEDITOR.tools.trim( this._.lastNode.getText( ) ) &&
+						!CKEDITOR.tools.trim( this._.lastNode.getText() ) &&
 						this._.lastNode.getParent().isBlockBoundary() )
 				{
 					var testRange = new CKEDITOR.dom.range( range.document );
@@ -112,13 +124,13 @@ CKEDITOR.plugins.add( 'domiterator' );
 			{
 				// closeRange indicates that a paragraph boundary has been found,
 				// so the range can be closed.
-				var closeRange = false,
-						parentPre = currentNode.hasAscendant( 'pre' );
+				var closeRange = 0,
+					parentPre = currentNode.hasAscendant( 'pre' );
 
 				// includeNode indicates that the current node is good to be part
 				// of the range. By default, any non-element node is ok for it.
 				var includeNode = ( currentNode.type != CKEDITOR.NODE_ELEMENT ),
-					continueFromSibling = false;
+					continueFromSibling = 0;
 
 				// If it is an element node, let's check if it can be part of the
 				// range.
@@ -132,7 +144,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 						// <br> boundaries must be part of the range. It will
 						// happen only if ForceBrBreak.
 						if ( nodeName == 'br' )
-							includeNode = true;
+							includeNode = 1;
 						else if ( !range && !currentNode.getChildCount() && nodeName != 'hr' )
 						{
 							// If we have found an empty block, and haven't started
@@ -154,7 +166,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 								this._.nextNode = currentNode;
 						}
 
-						closeRange = true;
+						closeRange = 1;
 					}
 					else
 					{
@@ -171,7 +183,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 							currentNode = currentNode.getFirst();
 							continue;
 						}
-						includeNode = true;
+						includeNode = 1;
 					}
 				}
 				else if ( currentNode.type == CKEDITOR.NODE_TEXT )
@@ -179,7 +191,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// Ignore normal whitespaces (i.e. not including &nbsp; or
 					// other unicode whitespaces) before/after a block node.
 					if ( beginWhitespaceRegex.test( currentNode.getText() ) )
-						includeNode = false;
+						includeNode = 0;
 				}
 
 				// The current node is good to be part of the range and we are
@@ -197,22 +209,25 @@ CKEDITOR.plugins.add( 'domiterator' );
 				// to close the range, otherwise we include the parent within it.
 				if ( range && !closeRange )
 				{
-					while ( !currentNode.getNext() && !isLast )
+					while ( !currentNode.getNext( skipGuard ) && !isLast )
 					{
 						var parentNode = currentNode.getParent();
 
 						if ( parentNode.isBlockBoundary( this.forceBrBreak
 								&& !parentPre && { br : 1 } ) )
 						{
-							closeRange = true;
+							closeRange = 1;
+							includeNode = 0;
 							isLast = isLast || ( parentNode.equals( lastNode) );
+							// Make sure range includes bookmarks at the end of the block. (#7359)
+							range.setEndAt( parentNode, CKEDITOR.POSITION_BEFORE_END );
 							break;
 						}
 
 						currentNode = parentNode;
-						includeNode = true;
+						includeNode = 1;
 						isLast = ( currentNode.equals( lastNode ) );
-						continueFromSibling = true;
+						continueFromSibling = 1;
 					}
 				}
 
@@ -220,7 +235,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 				if ( includeNode )
 					range.setEndAt( currentNode, CKEDITOR.POSITION_AFTER_END );
 
-				currentNode = currentNode.getNextSourceNode( continueFromSibling, null, lastNode );
+				currentNode = getNextSourceNode ( currentNode, continueFromSibling, lastNode );
 				isLast = !currentNode;
 
 				// We have found a block boundary. Let's close the range and move out of the
@@ -256,15 +271,15 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// Create the fixed block.
 					block = this.range.document.createElement( blockTag || 'p' );
 
-					// Move the contents of the temporary range to the fixed block.
-					range.extractContents().appendTo( block );
-					block.trim();
+						// Move the contents of the temporary range to the fixed block.
+						range.extractContents().appendTo( block );
+						block.trim();
 
-					// Insert the fixed block into the DOM.
-					range.insertNode( block );
+						// Insert the fixed block into the DOM.
+						range.insertNode( block );
 
-					removePreviousBr = removeLastBr = true;
-				}
+						removePreviousBr = removeLastBr = true;
+					}
 				else if ( block.getName() != 'li' )
 				{
 					// If the range doesn't includes the entire contents of the
@@ -297,8 +312,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					// the current range, which could be an <li> child (nested
 					// lists) or the next sibling <li>.
 
-					this._.nextNode = ( block.equals( lastNode ) ? null :
-						range.getBoundaryNodes().endNode.getNextSourceNode( true, null, lastNode ) );
+					this._.nextNode = ( block.equals( lastNode ) ? null : getNextSourceNode( range.getBoundaryNodes().endNode, 1, lastNode ) );
 				}
 			}
 
@@ -316,9 +330,6 @@ CKEDITOR.plugins.add( 'domiterator' );
 
 			if ( removeLastBr )
 			{
-				// Ignore bookmark nodes.(#3783)
-				var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
-
 				var lastChild = block.getLast();
 				if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )
 				{
@@ -336,7 +347,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 			if ( !this._.nextNode )
 			{
 				this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
-					block.getNextSourceNode( true, null, lastNode );
+					getNextSourceNode( block, 1, lastNode );
 			}
 
 			return block;