Ticket #6728: 6728_6.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

@@ -335 +335 @@
                         // next interation.
                         if ( !this._.nextNode )
                         {
-                                this._.nextNode = ( isLast || block.equals( lastNode ) ) ? null :
-                                        block.getNextSourceNode( true, null, lastNode );
-                        }
+                                var nextNode =  ( isLast || block.equals( lastNode ) ) ? null :
+                                        block.getNextSourceNode( 1, null, lastNode );
 
-                        if ( !bookmarkGuard( this._.nextNode ) )
-                        {
-                                this._.nextNode = this._.nextNode.getNextSourceNode( true, null, function( node )
-                                        { return !node.equals( lastNode ) && bookmarkGuard( node ); } );
+                                while( !bookmarkGuard( nextNode ) )
+                                        nextNode = nextNode.getNextSourceNode( 1, null, lastNode );
+
+                                this._.nextNode = nextNode;
                         }
 
                         return block;