Ticket #6376: 6376_6.patch

_source/plugins/bidi/plugin.js

@@ -52 +52 @@
                         chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 
-        function switchDir( element, dir, editor, state )
+        function switchDir( element, dir, editor, database )
         {
-                var dirBefore = element.getComputedStyle( 'direction' );
-
-                element.removeStyle( 'direction' );
-                element.removeAttribute( 'dir' );
+                // Check first whether one of the ancestors
+                // has already been styled.
+                var parent = element;
+                while ( ( parent = parent.getParent() ) && !parent.is( 'body' ) )
+                {
+                        if ( parent.getCustomData( 'bidi_processed' ) )
+                        {
+                                // Ancestor style must dominate.
+                                element.removeStyle( 'direction' );
+                                element.removeAttribute( 'dir' );
+                                return;
+                        }
+                }
 
-                if ( state == CKEDITOR.TRISTATE_OFF && element.getComputedStyle( 'direction' ).toLowerCase() != dir )
-                        element.setAttribute( 'dir', dir );
+                var useComputedState = ( 'useComputedState' in editor.config ) ? editor.config.useComputedState : 1;
+                
+                var elementDir = useComputedState ? element.getComputedStyle( 'direction' )
+                        : element.getStyle( 'direction' ) || element.hasAttribute( 'dir' );
+
+                // Stop if direction is same as present.
+                if ( elementDir == dir )
+                        return;
+
+                // Reuse computedState if we already have it.
+                var dirBefore = useComputedState ? elementDir : element.getComputedStyle( 'direction' );
+
+                // Clear direction on this element.
+                element.removeStyle( 'direction' );
+
+                // Set new direction for this element.
+                element.setAttribute( 'dir', dir );
 
                 // If the element direction changed, we need to switch the margins of
                 // the element and all its children, so it will get really reflected
                 // like a mirror. (#5910)
-                var dirAfter = element.getComputedStyle( 'direction' );
-                if ( dirAfter != dirBefore )
+                if ( dir != dirBefore )
                 {
                         var range = new CKEDITOR.dom.range( element.getDocument() );
                         range.setStartBefore( element );
@@ -98 +121 @@
                 }
 
                 editor.forceNextSelectionCheck();
+
+                CKEDITOR.dom.element.setMarker( database, element, 'bidi_processed', 1 );
+
+                return null;
         }
 
         function getFullySelected( selection, elements )
@@ -124 +151 @@
 
                         if ( ranges && ranges.length )
                         {
+                                var database = {};
                                 // Apply do directly selected elements from guardElements.
                                 var selectedElement = ranges[ 0 ].getEnclosedNode();
 
@@ -133 +161 @@
                                         )
                                         selectedElement = getFullySelected( selection, guardElements );
 
-                                if ( selectedElement )
-                                {
-                                        if ( !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor, this.state );
-                                }
-                                else
-                                {
-                                        // Creates bookmarks for selection, as we may split some blocks.
-                                        var bookmarks = selection.createBookmarks();
+                                if ( selectedElement && !selectedElement.isReadOnly() )
+                                        switchDir( selectedElement, dir, editor, database );
+                                
+                                // Creates bookmarks for selection, as we may split some blocks.
+                                var bookmarks = selection.createBookmarks();
 
-                                        var iterator,
-                                                block;
+                                var iterator,
+                                        block;
 
-                                        for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
-                                        {
-                                                // Array of elements processed as guardElements.
-                                                var processedElements = [];
-                                                // Walker searching for guardElements.
-                                                var walker = new CKEDITOR.dom.walker( ranges[ i ] );
-                                                walker.evaluator = function( node ){
-                                                        return node.type == CKEDITOR.NODE_ELEMENT
-                                                                && node.getName() in guardElements
-                                                                && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'
-                                                                        && node.getParent().type == CKEDITOR.NODE_ELEMENT
-                                                                        && node.getParent().getName() == 'blockquote'
-                                                                );
-                                                };
+                                for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
+                                {
+                                        // Array of elements processed as guardElements.
+                                        var processedElements = [];
+                                        // Walker searching for guardElements.
+                                        var walker = new CKEDITOR.dom.walker( ranges[ i ] );
+                                        walker.evaluator = function( node )
+                                        {
+                                                return node.type == CKEDITOR.NODE_ELEMENT
+                                                        && node.getName() in guardElements
+                                                        && !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'
+                                                                && node.getParent().type == CKEDITOR.NODE_ELEMENT
+                                                                && node.getParent().getName() == 'blockquote'
+                                                        );
+                                        };
 
-                                                while ( ( block = walker.next() ) )
-                                                {
-                                                        switchDir( block, dir, editor, this.state );
-                                                        processedElements.push( block );
-                                                }
+                                        while ( ( block = walker.next() ) )
+                                                switchDir( block, dir, editor, database );
 
-                                                iterator = ranges[ i ].createIterator();
-                                                iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
+                                        iterator = ranges[ i ].createIterator();
+                                        iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
-                                                while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
-                                                {
-                                                        if ( block.isReadOnly() )
-                                                                continue;
+                                        while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
+                                                !block.isReadOnly() && switchDir( block, dir, editor, database );
 
-                                                        var _break = 0;
+                                        CKEDITOR.dom.element.clearAllMarkers( database );
 
-                                                        // Check if block have been already processed by the walker above.
-                                                        for ( var ii = 0; ii < processedElements.length; ii++ )
-                                                        {
-                                                                var parent = block.getParent();
-
-                                                                while( parent && parent.getName() != 'body' )
-                                                                {
-                                                                        if ( ( parent.$.isSameNode && parent.$.isSameNode( processedElements[ ii ].$ ) )
-                                                                                        || parent.$ == processedElements[ ii ].$ )
-                                                                        {
-                                                                                _break = 1;
-                                                                                break;
-                                                                        }
-                                                                        parent = parent.getParent();
-                                                                }
-
-                                                                if ( _break )
-                                                                        break;
-                                                        }
-
-                                                        if ( !_break )
-                                                        {
-                                                                switchDir( block, dir, editor, this.state );
-                                                        }
-                                                }
-                                        }
-
                                         editor.forceNextSelectionCheck();
                                         // Restore selection position.
                                         selection.selectBookmarks( bookmarks );