Ticket #6237: 6237_2.patch

_source/plugins/bidi/plugin.js

@@ -52 +52 @@
                         chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 
-        function switchDir( element, dir, editor )
+        function switchDir( element, dir, editor, firstBlockDir )
         {
                 var dirBefore = element.getComputedStyle( 'direction' ),
                         currentDir = element.getStyle( 'direction' ) || element.getAttribute( 'dir' ) || '';
 
                 element.removeStyle( 'direction' );
 
-                if ( currentDir.toLowerCase() == dir )
-                        element.removeAttribute( 'dir' );
+                if ( firstBlockDir )
+                {
+                        element.setAttribute( 'dir', firstBlockDir );
+                }
                 else
-                        element.setAttribute( 'dir', dir );
+                {
+                        if ( currentDir.toLowerCase() == dir )
+                                element.removeAttribute( 'dir' );
+                        else
+                                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
@@ -146 +153 @@
                                         var bookmarks = selection.createBookmarks();
 
                                         var iterator,
-                                                block;
+                                                block,
+                                                firstBlockDir;
 
                                         for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
                                         {
@@ -165 +173 @@
 
                                                 while ( ( block = walker.next() ) )
                                                 {
-                                                        switchDir( block, dir, editor );
+                                                        switchDir( block, dir, editor, firstBlockDir );
                                                         processedElements.push( block );
+                                                        
+                                                        if ( !firstBlockDir )
+                                                                firstBlockDir = block.getComputedStyle( 'direction' );
                                                 }
 
                                                 iterator = ranges[ i ].createIterator();
@@ -201 +212 @@
 
                                                         if ( !_break )
                                                         {
-                                                                switchDir( block, dir, editor );
+                                                                switchDir( block, dir, editor, firstBlockDir );
                                                         }
+                                                        
+                                                        if ( !firstBlockDir )
+                                                                firstBlockDir = block.getComputedStyle( 'direction' );
                                                 }
                                         }