Ticket #6728: 6728_7.patch

_source/plugins/bidi/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
 (function()
 {
-        var guardElements = { table:1, tbody: 1, ul:1, ol:1, blockquote:1, div:1, tr: 1 },
+        var guardElements = { table:1, ul:1, ol:1, blockquote:1, div:1 },
                 directSelectionGuardElements = {},
                 // All guard elements which can have a direction applied on them.
                 allGuardElements = {};
@@ -153 +153 @@
                         while ( ancestor && ancestor.type == CKEDITOR.NODE_ELEMENT
                                         && ( parent = ancestor.getParent() )
                                         && parent.getChildCount() == 1
-                                        && ( !( ancestor.getName() in elements ) || ( parent.getName() in elements ) )
-                                        )
+                                        && !( ancestor.getName() in elements ) )
                                 ancestor = parent;
 
                         return ancestor.type == CKEDITOR.NODE_ELEMENT
@@ -209 +208 @@
                                         {
                                                 return !! ( node.type == CKEDITOR.NODE_ELEMENT
                                                                 && node.getName() in guardElements
-                                                                && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'
+                                                                && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' )
                                                                         && node.getParent().type == CKEDITOR.NODE_ELEMENT
                                                                         && node.getParent().getName() == 'blockquote' )
                                                                 // Element must be fully included in the range as well. (#6485).
@@ -225 +224 @@
 
                                         while ( ( block = iterator.getNextParagraph() ) )
                                                 !block.isReadOnly() && switchDir( block, dir, editor, database );
-                                }
+                                        }
 
                                 CKEDITOR.dom.element.clearAllMarkers( database );
 

_source/plugins/domiterator/plugin.js

@@ -30 +30 @@
         }
 
         var beginWhitespaceRegex = /^[\r\n\t ]+$/,
-                isBookmark = CKEDITOR.dom.walker.bookmark();
+                // Ignore bookmark nodes.(#3783)
+                bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
 
+        // Get a reference for the next element, bookmark nodes are skipped.
+        function getNextSourceNode( node, startFromSibling, lastNode )
+        {
+                var next = node.getNextSourceNode( startFromSibling, null, lastNode );
+                while ( !bookmarkGuard( next ) )
+                        next = next.getNextSourceNode( startFromSibling, null, lastNode );
+                return next;
+        }
+
         iterator.prototype = {
                 getNextParagraph : function( blockTag )
                 {
@@ -220 +230 @@
                                 if ( includeNode )
                                         range.setEndAt( currentNode, CKEDITOR.POSITION_AFTER_END );
 
-                                currentNode = currentNode.getNextSourceNode( continueFromSibling, null, lastNode );
+                                currentNode = getNextSourceNode ( currentNode, continueFromSibling, lastNode );
                                 isLast = !currentNode;
 
                                 // We have found a block boundary. Let's close the range and move out of the
@@ -256 +266 @@
                                         // Create the fixed block.
                                         block = this.range.document.createElement( blockTag || 'p' );
 
-                                        // Move the contents of the temporary range to the fixed block.
-                                        range.extractContents().appendTo( block );
-                                        block.trim();
+                                                // Move the contents of the temporary range to the fixed block.
+                                                range.extractContents().appendTo( block );
+                                                block.trim();
 
-                                        // Insert the fixed block into the DOM.
-                                        range.insertNode( block );
+                                                // Insert the fixed block into the DOM.
+                                                range.insertNode( block );
 
-                                        removePreviousBr = removeLastBr = true;
-                                }
+                                                removePreviousBr = removeLastBr = true;
+                                        }
                                 else if ( block.getName() != 'li' )
                                 {
                                         // If the range doesn't includes the entire contents of the
@@ -297 +307 @@
                                         // the current range, which could be an <li> child (nested
                                         // lists) or the next sibling <li>.
 
-                                        this._.nextNode = ( block.equals( lastNode ) ? null :
-                                                range.getBoundaryNodes().endNode.getNextSourceNode( true, null, lastNode ) );
+                                        this._.nextNode = ( block.equals( lastNode ) ? null : getNextSourceNode( range.getBoundaryNodes().endNode, 1, lastNode ) );
                                 }
                         }
 
-                        // Ignore bookmark nodes.(#3783)
-                        var bookmarkGuard = CKEDITOR.dom.walker.bookmark( false, true );
-
                         if ( removePreviousBr )
                         {
                                 var previousSibling = block.getPrevious();
@@ -336 +342 @@
                         if ( !this._.nextNode )
                         {
                                 this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
-                                        block.getNextSourceNode( true, null, lastNode );
+                                        getNextSourceNode( block, 1, lastNode );
                         }
 
-                        if ( !bookmarkGuard( this._.nextNode ) )
-                        {
-                                this._.nextNode = this._.nextNode.getNextSourceNode( true, null, function( node )
-                                        { return !node.equals( lastNode ) && bookmarkGuard( node ); } );
-                        }
-
                         return block;
                 }
         };