Ticket #5435: 5435.patch

_source/plugins/list/plugin.js

@@ -438 +438 @@
                         while ( ranges.length > 0 )
                         {
                                 range = ranges.shift();
-
-                                var boundaryNodes = range.getBoundaryNodes(),
-                                        startNode = boundaryNodes.startNode,
-                                        endNode = boundaryNodes.endNode;
-
-                                if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.getName() == 'td' )
-                                        range.setStartAt( boundaryNodes.startNode, CKEDITOR.POSITION_AFTER_START );
-
-                                if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.getName() == 'td' )
-                                        range.setEndAt( boundaryNodes.endNode, CKEDITOR.POSITION_BEFORE_END );
-
                                 var iterator = range.createIterator(),
                                         block;
 

_source/plugins/domiterator/plugin.js

@@ -51 +51 @@
                         if ( !this._.lastNode )
                         {
                                 range = this.range.clone();
+
+                                // Shrink the range to exclude harmful "noises" (#4087, #4450, #5435).
+                                range.shrink( CKEDITOR.NODE_ELEMENT, true );
+
                                 range.enlarge( this.forceBrBreak || !this.enlargeBr ?
                                                            CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS : CKEDITOR.ENLARGE_BLOCK_CONTENTS );
 
@@ -212 +216 @@
 
                                 // 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 );
-
-                                        // Drop the range if it only contains bookmark nodes, and is
-                                        // not because of the original collapsed range. (#4087,#4450)
-                                        if ( boundaryNodes.startNode.getParent().equals( startPath.blockLimit )
-                                                 && isBookmark( boundaryNodes.startNode ) && isBookmark( boundaryNodes.endNode ) )
-                                        {
-                                                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.
                         if ( !block )
                         {