Ticket #6376: 6376_2.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' );
-
-                element.removeStyle( 'direction' );
-                element.removeAttribute( 'dir' );
+                var useComputedState = editor.config.useComputedState;
+                useComputedState = useComputedState === undefined || useComputedState;
+                
+                var elementDir = useComputedState ? element.getComputedStyle( 'direction' )
+                        : element.hasAttribute( 'dir' ) || element.getStyle( 'direction' );
 
-                if ( state == CKEDITOR.TRISTATE_OFF && element.getComputedStyle( 'direction' ).toLowerCase() != dir )
-                        element.setAttribute( 'dir', dir );
+                // Stop if direction is same as present.
+                if ( elementDir == dir )
+                        return;
+
+                var dirBefore = element.getComputedStyle( 'direction' );
+
+                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
@@ -98 +104 @@
                 }
 
                 editor.forceNextSelectionCheck();
+
+                return null;
         }
 
         function getFullySelected( selection, elements )
@@ -136 +144 @@
                                 if ( selectedElement )
                                 {
                                         if ( !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor, this.state );
+                                                switchDir( selectedElement, dir, editor );
                                 }
                                 else
                                 {
@@ -163 +171 @@
 
                                                 while ( ( block = walker.next() ) )
                                                 {
-                                                        switchDir( block, dir, editor, this.state );
+                                                        switchDir( block, dir, editor );
                                                         processedElements.push( block );
                                                 }
 
@@ -199 +207 @@
 
                                                         if ( !_break )
                                                         {
-                                                                switchDir( block, dir, editor, this.state );
+                                                                switchDir( block, dir, editor );
                                                         }
                                                 }
                                         }