Ticket #5910: 5910_4.patch

_source/plugins/bidi/plugin.js

@@ -42 +42 @@
          */
         function switchDir( element, dir, editor )
         {
+                var dirBefore = element.getComputedStyle( 'direction' );
+
                 if ( element.hasAttribute( 'dir' ) && element.getAttribute( 'dir' ).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
+                // like a mirror. (#5910)
+                var dirAfter = element.getComputedStyle( 'direction' );
+                if ( dirAfter != dirBefore )
+                {
+                        var range = new CKEDITOR.dom.range( element.getDocument() );
+                        range.setStartBefore( element );
+                        range.setEndAfter( element );
+
+                        var walker = new CKEDITOR.dom.walker( range );
+                        
+                        var node;
+                        while ( node = walker.next() )
+                        {
+                                if ( node.type == CKEDITOR.NODE_ELEMENT )
+                                {
+                                        // A child with dir defined is to be ignored.
+                                        if ( !node.equals( element ) && node.hasAttribute( 'dir' ) )
+                                        {
+                                                range.setStartAfter( node );
+                                                walker = new CKEDITOR.dom.walker( range );
+                                                continue;
+                                        }
+
+                                        // Switch the margins.
+                                        var marginLeft = node.getStyle( 'margin-right' ),
+                                                marginRight = node.getStyle( 'margin-left' );
+                                        
+                                        marginLeft ? node.setStyle( 'margin-left', marginLeft ) : node.removeStyle( 'margin-left' );
+                                        marginRight ? node.setStyle( 'margin-right', marginRight ) : node.removeStyle( 'margin-right' );
+                                }
+                        }
+                }
+
                 editor.forceNextSelectionCheck();
         }
 

_source/plugins/indent/plugin.js

@@ -53 +53 @@
                 }
                 else
                 {
-                        var indent = parseInt( firstBlock.getStyle( this.indentCssProperty ), 10 );
+                        var indent = parseInt( firstBlock.getStyle( getIndentCssProperty( firstBlock ) ), 10 );
                         if ( isNaN( indent ) )
                                 indent = 0;
                         if ( indent <= 0 )
@@ -73 +73 @@
                         for ( var i = 0 ; i < editor.config.indentClasses.length ; i++ )
                                 this.indentClassMap[ editor.config.indentClasses[i] ] = i + 1;
                 }
-                else
-                        this.indentCssProperty = editor.config.contentsLangDirection == 'ltr' ? 'margin-left' : 'margin-right';
+
                 this.startDisabled = name == 'outdent';
         }
 
+        // Returns the CSS property to be used for identing a given element.
+        function getIndentCssProperty( element )
+        {
+                return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';
+        }
+
         function isListItem( node )
         {
                 return node.type = CKEDITOR.NODE_ELEMENT && node.is( 'li' );
@@ -250 +255 @@
                                 }
                                 else
                                 {
-                                        var currentOffset = parseInt( element.getStyle( self.indentCssProperty ), 10 );
+                                        var indentCssProperty = getIndentCssProperty( element );
+                                        var currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
                                         if ( isNaN( currentOffset ) )
                                                 currentOffset = 0;
                                         currentOffset += ( self.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
@@ -260 +266 @@
 
                                         currentOffset = Math.max( currentOffset, 0 );
                                         currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
-                                        element.setStyle( self.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
+                                        element.setStyle( indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
                                         if ( element.getAttribute( 'style' ) === '' )
                                                 element.removeAttribute( 'style' );
                                 }