vanilla ckeditor-3.4.1

[ckeditor.git] / _source / plugins / domiterator / plugin.js

diff --git a/_source/plugins/domiterator/plugin.js b/_source/plugins/domiterator/plugin.js
index ded0a32..f0b1835 100644 (file)
--- a/_source/plugins/domiterator/plugin.js
+++ b/_source/plugins/domiterator/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -11,7 +11,9 @@ CKEDITOR.plugins.add( 'domiterator' );
 \r
 (function()\r
 {\r
-\r
+       /**\r
+        * @name CKEDITOR.dom.iterator\r
+        */\r
        function iterator( range )\r
        {\r
                if ( arguments.length < 1 )\r
@@ -42,6 +44,9 @@ CKEDITOR.plugins.add( 'domiterator' );
                        // Indicats that the current element in the loop is the last one.\r
                        var isLast;\r
 \r
+                       // Indicate at least one of the range boundaries is inside a preformat block.\r
+                       var touchPre;\r
+\r
                        // Instructs to cleanup remaining BRs.\r
                        var removePreviousBr, removeLastBr;\r
 \r
@@ -49,7 +54,14 @@ CKEDITOR.plugins.add( 'domiterator' );
                        if ( !this._.lastNode )\r
                        {\r
                                range = this.range.clone();\r
-                               range.enlarge( this.forceBrBreak || !this.enlargeBr ?\r
+\r
+                               // Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).\r
+                               range.shrink( CKEDITOR.NODE_ELEMENT, true );\r
+\r
+                               touchPre = range.endContainer.hasAscendant( 'pre', true )\r
+                                       || range.startContainer.hasAscendant( 'pre', true );\r
+\r
+                               range.enlarge( this.forceBrBreak && !touchPre || !this.enlargeBr ?\r
                                                           CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );\r
 \r
                                var walker = new CKEDITOR.dom.walker( range ),\r
@@ -100,7 +112,8 @@ CKEDITOR.plugins.add( 'domiterator' );
                        {\r
                                // closeRange indicates that a paragraph boundary has been found,\r
                                // so the range can be closed.\r
-                               var closeRange = false;\r
+                               var closeRange = false,\r
+                                               parentPre = currentNode.hasAscendant( 'pre' );\r
 \r
                                // includeNode indicates that the current node is good to be part\r
                                // of the range. By default, any non-element node is ok for it.\r
@@ -113,7 +126,8 @@ CKEDITOR.plugins.add( 'domiterator' );
                                {\r
                                        var nodeName = currentNode.getName();\r
 \r
-                                       if ( currentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )\r
+                                       if ( currentNode.isBlockBoundary( this.forceBrBreak &&\r
+                                                       !parentPre && { br : 1 } ) )\r
                                        {\r
                                                // <br> boundaries must be part of the range. It will\r
                                                // happen only if ForceBrBreak.\r
@@ -187,7 +201,8 @@ CKEDITOR.plugins.add( 'domiterator' );
                                        {\r
                                                var parentNode = currentNode.getParent();\r
 \r
-                                               if ( parentNode.isBlockBoundary( this.forceBrBreak && { br : 1 } ) )\r
+                                               if ( parentNode.isBlockBoundary( this.forceBrBreak\r
+                                                               && !parentPre && { br : 1 } ) )\r
                                                {\r
                                                        closeRange = true;\r
                                                        isLast = isLast || ( parentNode.equals( lastNode) );\r
@@ -210,26 +225,8 @@ CKEDITOR.plugins.add( 'domiterator' );
 \r
                                // We have found a block boundary. Let's close the range and move out of the\r
                                // loop.\r
-                               if ( ( closeRange || isLast ) && range )\r
-                               {\r
-                                       var boundaryNodes = range.getBoundaryNodes(),\r
-                                               startPath = new CKEDITOR.dom.elementPath( range.startContainer );\r
-\r
-                                       // Drop the range if it only contains bookmark nodes, and is\r
-                                       // not because of the original collapsed range. (#4087,#4450)\r
-                                       if ( boundaryNodes.startNode.getParent().equals( startPath.blockLimit )\r
-                                                && isBookmark( boundaryNodes.startNode ) && isBookmark( boundaryNodes.endNode ) )\r
-                                       {\r
-                                               range = null;\r
-                                               this._.nextNode = null;\r
-                                       }\r
-                                       else\r
+                               if ( isLast || ( closeRange && range ) )\r
                                                break;\r
-                               }\r
-\r
-                               if ( isLast )\r
-                                       break;\r
-\r
                        }\r
 \r
                        // Now, based on the processed range, look for (or create) the block to be returned.\r
@@ -243,7 +240,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                        return null;\r
                                }\r
 \r
-                               startPath = new CKEDITOR.dom.elementPath( range.startContainer );\r
+                               var startPath = new CKEDITOR.dom.elementPath( range.startContainer );\r
                                var startBlockLimit = startPath.blockLimit,\r
                                        checkLimits = { div : 1, th : 1, td : 1 };\r
                                block = startPath.block;\r