Ticket #6237: 6237_4.patch

_source/plugins/bidi/plugin.js

@@ -52 +52 @@
                         chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 
-        function switchDir( element, dir, editor )
+        function switchDir( element, dir, editor, state )
         {
-                var dirBefore = element.getComputedStyle( 'direction' ),
-                        currentDir = element.getStyle( 'direction' ) || element.getAttribute( 'dir' ) || '';
+                var dirBefore = element.getComputedStyle( 'direction' );
 
                 element.removeStyle( 'direction' );
+                element.removeAttribute( 'dir' );
 
-                if ( currentDir.toLowerCase() == dir )
-                        element.removeAttribute( 'dir' );
-                else
+                if ( state == CKEDITOR.TRISTATE_OFF && element.getComputedStyle( 'direction' ).toLowerCase() != dir )
                         element.setAttribute( 'dir', dir );
 
                 // If the element direction changed, we need to switch the margins of
@@ -138 +136 @@
                                 if ( selectedElement )
                                 {
                                         if ( !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor );
+                                                switchDir( selectedElement, dir, editor, this.state );
                                 }
                                 else
                                 {
@@ -165 +163 @@
 
                                                 while ( ( block = walker.next() ) )
                                                 {
-                                                        switchDir( block, dir, editor );
+                                                        switchDir( block, dir, editor, this.state );
                                                         processedElements.push( block );
                                                 }
 
@@ -201 +199 @@
 
                                                         if ( !_break )
                                                         {
-                                                                switchDir( block, dir, editor );
+                                                                switchDir( block, dir, editor, this.state );
                                                         }
                                                 }
                                         }