Ticket #5910: 5910_3.patch

_source/plugins/indent/plugin.js

@@ -26 +26 @@
                 var elementPath = evt.data.path,
                                 list = elementPath && elementPath.contains( listNodeNames );
 
+                var elementDirection = evt.data.element.getComputedStyle( 'direction' ).toLowerCase();
+                editor._.commands.indent.indentCssProperty = ( elementDirection == 'ltr' ) ? 'margin-left' : 'margin-right';
+
                 if ( list )
                                 return setState.call( this, editor, CKEDITOR.TRISTATE_OFF );
 
@@ -37 +40 @@
                 if ( !firstBlock )
                         return setState.call( this, editor, CKEDITOR.TRISTATE_DISABLED );
 
+                // Fix reference to command property (by redundant copy).
+                this.indentCssProperty = editor._.commands.indent.indentCssProperty;
+
                 if ( this.useIndentClasses )
                 {
                         var indentClass = firstBlock.$.className.match( this.classNameRegex ),
@@ -183 +189 @@
 
         function indentBlock( editor, range )
         {
+                // Fix reference to command property (by redundant copy).
+                this.indentCssProperty = editor._.commands.indent.indentCssProperty;
+
                 var iterator = range.createIterator(),
                         enterMode = editor.config.enterMode;
                 iterator.enforceRealBlocks = true;
@@ -233 +242 @@
                         if ( currentOffset < 0 )
                                 return false;
 
-                                currentOffset = Math.max( currentOffset, 0 );
-                                currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
-                        element.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
-                        if ( element.getAttribute( 'style' ) === '' )
-                                element.removeAttribute( 'style' );
+                        currentOffset = Math.max( currentOffset, 0 );
+                        currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
+
+                                // Determine text direction for this element.
+                                var editorDir = ( editor.config.contentsLangDirection == 'ui' )
+                                        ? editor.lang.dir : editor.config.contentsLangDirection;
+                                var dir = element.getComputedStyle( 'direction' ).toLowerCase();
+
+                                var marginDir = ( dir == 'ltr' ) ? 'left' : 'right';
+                                element.setStyle( 'margin-' + marginDir, currentOffset ? currentOffset + editor.config.indentUnit : '' );
+
+                                if ( element.getAttribute( 'style' ) === '' )
+                                        element.removeAttribute( 'style' );
                         }
 
                 return true;
-                }
+        }
 
         function indentCommand( editor, name )
         {

_source/plugins/bidi/plugin.js

@@ -26 +26 @@
                                 && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )
                         )
                         selectedElement = getFullySelected( selection, guardElements );
-                
+
                 selectedElement = selectedElement || path.block || path.blockLimit;
 
                 if ( !selectedElement || selectedElement.getName() == 'body' )
@@ -42 +42 @@
          */
         function switchDir( element, dir, editor )
         {
-                if ( element.hasAttribute( 'dir' ) && element.getAttribute( 'dir' ).toLowerCase()  == dir )
-                        element.removeAttribute( 'dir' );
-                else
-                        element.setAttribute( 'dir', dir );
+                var switchMargin,
+                        editorDir = ( editor.config.contentsLangDirection == 'ui' )
+                                ? editor.lang.dir : editor.config.contentsLangDirection;
+
+                if ( element.hasAttribute( 'dir' ) )
+                {
+                        if ( element.getAttribute( 'dir' ).toLowerCase() == dir )
+                                element.removeAttribute( 'dir' );
+                        else
+                                element.setAttribute( 'dir', dir );
+                }
+                else
+                {
+                        element.setAttribute( 'dir', dir );
 
+                        if ( dir != editorDir )
+                                switchMargin = dir;
+                }
+
                 editor.forceNextSelectionCheck();
-        }
+
+                if ( !switchMargin )
+                        return;
+
+                var selection = new CKEDITOR.dom.selection( editor.document );
+                selection.selectElement( element );
+                // Walker searching for guardElements.
+                var walker = new CKEDITOR.dom.walker( selection.getRanges()[ 0 ] );
+
+                var block;
+                var sourceMargin = ( dir == 'rtl' ) ? 'left' : 'right';
+                var targetMargin = ( sourceMargin == 'left' ) ? 'right' : 'left';
+
+                while ( block = walker.next() )
+                {
+                        if ( block.type == CKEDITOR.NODE_ELEMENT && block.getStyle( 'margin-' + sourceMargin ) )
+                        {
+                                var val = block.getStyle( 'margin-' + sourceMargin );
+                                block.setStyle( 'margin-' + targetMargin, val );
+                                block.removeStyle( 'margin-' + sourceMargin );
+                        }
+                }
+        }
 
         /**
          *