Ticket #3352: 3352.patch

_source/plugins/domiterator/plugin.js

@@ -11 +11 @@
 
 (function()
 {
-        // Functions ported over from v2.
-        function getTouchedStartNode( range )
+        
+        /**
+         * Find next source order node, ignore bookmark nodes and stop at the specified end node.
+         * @param {Object} currentNode 
+         * @param {Object} endNode
+         */
+        function getNextSourceNode( currentNode, endNode )
         {
-                var container = range.startContainer;
-
-                if ( range.collapsed || container.type != CKEDITOR.NODE_ELEMENT )
-                        return container;
-
-                return container.getChildCount() > range.startOffset ? container.getChild( range.startOffset ) : container;
-        }
-
-        function getTouchedEndNode( range )
-        {
-                var container = range.endContainer;
-
-                if ( range.collapsed || container.type != CKEDITOR.NODE_ELEMENT )
-                        return container;
-
-                return container.getChildCount() > range.endOffset ? container.getChild( range.endOffset ) : container;
-        }
-
-        function getNextSourceNode( currentNode, startFromSibling, nodeType, stopSearchNode )
-        {
-                if ( !currentNode )
-                        return null;
-
-                var node;
-
-                if ( !startFromSibling && currentNode.getFirst && currentNode.getFirst() )
-                        node = currentNode.getFirst();
-                else
+                var next = currentNode;
+                do
                 {
-                        if ( stopSearchNode && currentNode.equals( stopSearchNode ) )
-                                return null;
-
-                        node = currentNode.getNext();
-
-                        if ( !node && ( !stopSearchNode || !stopSearchNode.equals( currentNode.parentNode ) ) )
-                                return getNextSourceNode( currentNode.getParent(), true, nodeType, stopSearchNode );
+                        next = next.getNextSourceNode( 
+                                true, null, endNode );
                 }
-
-                if ( nodeType && node && node.type != nodeType )
-                        return getNextSourceNode( node, false, nodeType, stopSearchNode );
-
-                return node;
+                while( next && next.getName 
+                                        && next.getName() == 'span' 
+                                        && next.getAttribute( '_fck_bookmark' ) )
+                return next;
         }
 
         var iterator = function( range )
@@ -93 +66 @@
                                 range = this.range.clone();
                                 range.enlarge( this.forceBrBreak ? CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
-                                this._.nextNode = getTouchedStartNode( range );
-                                this._.lastNode = getTouchedEndNode( range );
+                                this._.nextNode = range.getTouchedStartNode();
+                                this._.lastNode = range.getTouchedEndNode();
 
                                 // Let's reuse this variable.
                                 range = null;
@@ -231 +204 @@
 
                                 if ( isLast )
                                         break;
-
-                                currentNode = getNextSourceNode( currentNode, continueFromSibling, null, lastNode );
+                                
+                                currentNode = getNextSourceNode( currentNode, lastNode );
                         }
 
                         // Now, based on the processed range, look for (or create) the block to be returned.
@@ -303 +276 @@
                                         // lists) or the next sibling <li>.
 
                                         this._.nextNode = ( block.equals( lastNode ) ? null :
-                                                        getNextSourceNode( range.getBoundaryNodes().endNode, true, null, lastNode ) );
+                                                getNextSourceNode( range.getBoundaryNodes().endNode, lastNode ) );
                                 }
                         }
 
@@ -330 +303 @@
                         // above block can be removed or changed, so we can rely on it for the
                         // next interation.
                         if ( !this._.nextNode )
-                                this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null : getNextSourceNode( block, true, null, lastNode );
+                                this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null : 
+                                        getNextSourceNode( block, lastNode );
 
                         return block;
                 }