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

diff --git a/_source/plugins/domiterator/plugin.js b/_source/plugins/domiterator/plugin.js
index a7a8e4d..f0b1835 100644
--- a/_source/plugins/domiterator/plugin.js
+++ b/_source/plugins/domiterator/plugin.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
 */
 
@@ -11,8 +11,10 @@ CKEDITOR.plugins.add( 'domiterator' );
 
 (function()
 {
-
-	var iterator = function( range )
+	/**
+	 * @name CKEDITOR.dom.iterator
+	 */
+	function iterator( range )
 	{
 		if ( arguments.length < 1 )
 			return;
@@ -25,9 +27,10 @@ CKEDITOR.plugins.add( 'domiterator' );
 		this.enforceRealBlocks = false;
 
 		this._ || ( this._ = {} );
-	},
-		beginWhitespaceRegex = /^[\r\n\t ]+$/;
+	}
 
+	var beginWhitespaceRegex = /^[\r\n\t ]+$/,
+		isBookmark = CKEDITOR.dom.walker.bookmark();
 
 	iterator.prototype = {
 		getNextParagraph : function( blockTag )
@@ -41,6 +44,9 @@ CKEDITOR.plugins.add( 'domiterator' );
 			// Indicats that the current element in the loop is the last one.
 			var isLast;
 
+			// Indicate at least one of the range boundaries is inside a preformat block.
+			var touchPre;
+
 			// Instructs to cleanup remaining BRs.
 			var removePreviousBr, removeLastBr;
 
@@ -48,7 +54,14 @@ CKEDITOR.plugins.add( 'domiterator' );
 			if ( !this._.lastNode )
 			{
 				range = this.range.clone();
-				range.enlarge( this.forceBrBreak || !this.enlargeBr ?
+
+				// Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).
+				range.shrink( CKEDITOR.NODE_ELEMENT, true );
+
+				touchPre = range.endContainer.hasAscendant( 'pre', true )
+					|| range.startContainer.hasAscendant( 'pre', true );
+
+				range.enlarge( this.forceBrBreak && !touchPre || !this.enlargeBr ?
 							   CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
 				var walker = new CKEDITOR.dom.walker( range ),
@@ -99,7 +112,8 @@ CKEDITOR.plugins.add( 'domiterator' );
 			{
 				// closeRange indicates that a paragraph boundary has been found,
 				// so the range can be closed.
-				var closeRange = false;
+				var closeRange = false,
+						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.
@@ -112,7 +126,8 @@ CKEDITOR.plugins.add( 'domiterator' );
 				{
 					var nodeName = currentNode.getName();
 
-					if ( currentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )
+					if ( currentNode.isBlockBoundary( this.forceBrBreak &&
+							!parentPre && { br : 1 } ) )
 					{
 						// <br> boundaries must be part of the range. It will
 						// happen only if ForceBrBreak.
@@ -186,7 +201,8 @@ CKEDITOR.plugins.add( 'domiterator' );
 					{
 						var parentNode = currentNode.getParent();
 
-						if ( parentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )
+						if ( parentNode.isBlockBoundary( this.forceBrBreak
+								&& !parentPre && { br : 1 } ) )
 						{
 							closeRange = true;
 							isLast = isLast || ( parentNode.equals( lastNode) );
@@ -209,28 +225,8 @@ CKEDITOR.plugins.add( 'domiterator' );
 
 				// We have found a block boundary. Let's close the range and move out of the
 				// loop.
-				if ( ( closeRange || isLast ) && range )
-				{
-					var boundaryNodes = range.getBoundaryNodes(),
-						startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
-						endPath = new CKEDITOR.dom.elementPath( range.endContainer );
-
-					// Drop the range if it only contains bookmark nodes.(#4087)
-					if ( boundaryNodes.startNode.equals( boundaryNodes.endNode )
-						&& boundaryNodes.startNode.getParent().equals( startPath.blockLimit )
-						&& boundaryNodes.startNode.type == CKEDITOR.NODE_ELEMENT
-						&& boundaryNodes.startNode.getAttribute( '_fck_bookmark' ) )
-					{
-						range = null;
-						this._.nextNode = null;
-					}
-					else
+				if ( isLast || ( closeRange && range ) )
 						break;
-				}
-
-				if ( isLast )
-					break;
-
 			}
 
 			// Now, based on the processed range, look for (or create) the block to be returned.
@@ -244,7 +240,7 @@ CKEDITOR.plugins.add( 'domiterator' );
 					return null;
 				}
 
-				startPath = new CKEDITOR.dom.elementPath( range.startContainer );
+				var startPath = new CKEDITOR.dom.elementPath( range.startContainer );
 				var startBlockLimit = startPath.blockLimit,
 					checkLimits = { div : 1, th : 1, td : 1 };
 				block = startPath.block;