Ticket #6376: 6376_4.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 )
         {
-                var dirBefore = element.getComputedStyle( 'direction' );
-
+                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' );
-                element.removeAttribute( 'dir' );
 
-                if ( state == CKEDITOR.TRISTATE_OFF && element.getComputedStyle( 'direction' ).toLowerCase() != dir )
-                        element.setAttribute( 'dir', dir );
+                // 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 +107 @@
                 }
 
                 editor.forceNextSelectionCheck();
+
+                return null;
         }
 
         function getFullySelected( selection, elements )
@@ -136 +147 @@
                                 if ( selectedElement )
                                 {
                                         if ( !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor, this.state );
+                                                switchDir( selectedElement, dir, editor );
                                 }
                                 else
                                 {
@@ -163 +174 @@
 
                                                 while ( ( block = walker.next() ) )
                                                 {
-                                                        switchDir( block, dir, editor, this.state );
+                                                        switchDir( block, dir, editor );
                                                         processedElements.push( block );
                                                 }
 
@@ -199 +210 @@
 
                                                         if ( !_break )
                                                         {
-                                                                switchDir( block, dir, editor, this.state );
+                                                                switchDir( block, dir, editor );
                                                         }
                                                 }
                                         }