Ticket #4450: 4450_3.patch

_source/plugins/domiterator/plugin.js

@@ -25 +25 @@
                 this.enforceRealBlocks = false;
 
                 this._ || ( this._ = {} );
-        },
-                beginWhitespaceRegex = /^[\r\n\t ]+$/;
+        };
 
+        var beginWhitespaceRegex = /^[\r\n\t ]+$/,
+                isBookmark = CKEDITOR.dom.walker.bookmark();
 
         iterator.prototype = {
                 getNextParagraph : function( blockTag )
@@ -211 +212 @@
                                 // loop.
                                 if ( ( closeRange || isLast ) && range )
                                 {
-                                        var boundaryNodes = range.getBoundaryNodes(),
-                                                startPath = new CKEDITOR.dom.elementPath( range.startContainer ),
-                                                endPath = new CKEDITOR.dom.elementPath( range.endContainer );
+                                        var boundaryNodes = range.getBoundaryNodes();
 
-                                        // 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' ) )
+                                        // Drop the range if it only contains bookmark nodes, and is
+                                        // not because of the original collapsed range. (#4087,#4450)
+                                        if ( !this.range.collapsed
+                                                 && isBookmark( boundaryNodes.startNode ) && isBookmark( boundaryNodes.endNode ) )
                                         {
                                                 range = null;
                                                 this._.nextNode = null;