vanilla ckeditor-3.4.2

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

diff --git a/_source/plugins/domiterator/plugin.js b/_source/plugins/domiterator/plugin.js
index f0b1835..9fc5fd5 100644 (file)
--- a/_source/plugins/domiterator/plugin.js
+++ b/_source/plugins/domiterator/plugin.js
@@ -20,11 +20,11 @@ CKEDITOR.plugins.add( 'domiterator' );
                        return;\r
 \r
                this.range = range;\r
-               this.forceBrBreak = false;\r
+               this.forceBrBreak = 0;\r
 \r
                // Whether include <br>s into the enlarged range.(#3730).\r
-               this.enlargeBr = true;\r
-               this.enforceRealBlocks = false;\r
+               this.enlargeBr = 1;\r
+               this.enforceRealBlocks = 0;\r
 \r
                this._ || ( this._ = {} );\r
        }\r
@@ -80,7 +80,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                // next block.(#3887)\r
                                if ( this._.lastNode &&\r
                                                this._.lastNode.type == CKEDITOR.NODE_TEXT &&\r
-                                               !CKEDITOR.tools.trim( this._.lastNode.getText( ) ) &&\r
+                                               !CKEDITOR.tools.trim( this._.lastNode.getText() ) &&\r
                                                this._.lastNode.getParent().isBlockBoundary() )\r
                                {\r
                                        var testRange = new CKEDITOR.dom.range( range.document );\r
@@ -112,13 +112,13 @@ 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
-                                               parentPre = currentNode.hasAscendant( 'pre' );\r
+                               var closeRange = 0,\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
                                var includeNode = ( currentNode.type != CKEDITOR.NODE_ELEMENT ),\r
-                                       continueFromSibling = false;\r
+                                       continueFromSibling = 0;\r
 \r
                                // If it is an element node, let's check if it can be part of the\r
                                // range.\r
@@ -132,7 +132,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                                // <br> boundaries must be part of the range. It will\r
                                                // happen only if ForceBrBreak.\r
                                                if ( nodeName == 'br' )\r
-                                                       includeNode = true;\r
+                                                       includeNode = 1;\r
                                                else if ( !range && !currentNode.getChildCount() && nodeName != 'hr' )\r
                                                {\r
                                                        // If we have found an empty block, and haven't started\r
@@ -154,7 +154,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                                                this._.nextNode = currentNode;\r
                                                }\r
 \r
-                                               closeRange = true;\r
+                                               closeRange = 1;\r
                                        }\r
                                        else\r
                                        {\r
@@ -171,7 +171,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                                        currentNode = currentNode.getFirst();\r
                                                        continue;\r
                                                }\r
-                                               includeNode = true;\r
+                                               includeNode = 1;\r
                                        }\r
                                }\r
                                else if ( currentNode.type == CKEDITOR.NODE_TEXT )\r
@@ -179,7 +179,7 @@ CKEDITOR.plugins.add( 'domiterator' );
                                        // Ignore normal whitespaces (i.e. not including &nbsp; or\r
                                        // other unicode whitespaces) before/after a block node.\r
                                        if ( beginWhitespaceRegex.test( currentNode.getText() ) )\r
-                                               includeNode = false;\r
+                                               includeNode = 0;\r
                                }\r
 \r
                                // The current node is good to be part of the range and we are\r
@@ -204,15 +204,15 @@ CKEDITOR.plugins.add( 'domiterator' );
                                                if ( parentNode.isBlockBoundary( this.forceBrBreak\r
                                                                && !parentPre && { br : 1 } ) )\r
                                                {\r
-                                                       closeRange = true;\r
+                                                       closeRange = 1;\r
                                                        isLast = isLast || ( parentNode.equals( lastNode) );\r
                                                        break;\r
                                                }\r
 \r
                                                currentNode = parentNode;\r
-                                               includeNode = true;\r
+                                               includeNode = 1;\r
                                                isLast = ( currentNode.equals( lastNode ) );\r
-                                               continueFromSibling = true;\r
+                                               continueFromSibling = 1;\r
                                        }\r
                                }\r
 \r
@@ -302,6 +302,9 @@ CKEDITOR.plugins.add( 'domiterator' );
                                }\r
                        }\r
 \r
+                       // Ignore bookmark nodes.(#3783)\r
+                       var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );\r
+\r
                        if ( removePreviousBr )\r
                        {\r
                                var previousSibling = block.getPrevious();\r
@@ -316,9 +319,6 @@ CKEDITOR.plugins.add( 'domiterator' );
 \r
                        if ( removeLastBr )\r
                        {\r
-                               // Ignore bookmark nodes.(#3783)\r
-                               var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );\r
-\r
                                var lastChild = block.getLast();\r
                                if ( lastChild && lastChild.type == CKEDITOR.NODE_ELEMENT && lastChild.getName() == 'br' )\r
                                {\r
@@ -339,6 +339,12 @@ CKEDITOR.plugins.add( 'domiterator' );
                                        block.getNextSourceNode( true, null, lastNode );\r
                        }\r
 \r
+                       if ( !bookmarkGuard( this._.nextNode ) )\r
+                       {\r
+                               this._.nextNode = this._.nextNode.getNextSourceNode( true, null, function( node )\r
+                                       { return !node.equals( lastNode ) && bookmarkGuard( node ); } );\r
+                       }\r
+\r
                        return block;\r
                }\r
        };\r