Ticket #5910: 5910_2.patch

_source/plugins/indent/plugin.js

@@ -37 +37 @@
                 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 ),
@@ -62 +65 @@
                 }
         }
 
+        function onSelectionChangeUpdateDir( evt )
+        {
+                var editor = evt.editor;
+
+                editor._.commands.indent.indentCssProperty = ( getDirFromSelection( editor ) == 'ltr' )
+                        ? 'margin-left' : 'margin-right';
+        }
+
+        function getDirFromSelection( editor )
+        {
+                var selection = editor.getSelection(),
+                        enterMode = editor.config.enterMode,
+                        ranges = selection && selection.getRanges();
+
+                var commonAncestor = ranges && ranges[0].getCommonAncestor( true );
+
+                var elementCheck = commonAncestor,
+                        dir = editor.config.contentsLangDirection;
+                
+                while ( elementCheck )
+                {
+                        if ( elementCheck.type == CKEDITOR.NODE_ELEMENT && elementCheck.hasAttribute( 'dir' ) )
+                        {
+                                dir = elementCheck.getAttribute( 'dir' );
+                                break;
+                        }
+                        elementCheck = elementCheck.getParent();
+                }
+
+                return dir;
+        }
+
         function indentList( editor, range, listNode )
         {
                 // Our starting and ending points of the range might be inside some blocks under a list item...
@@ -183 +218 @@
 
         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;
@@ -193 +231 @@
         }
 
         function indentElement( editor, element )
-                {
-                        if ( this.useIndentClasses )
-                        {
+        {
+                if ( this.useIndentClasses )
+                {
+                        if ( this.useIndentClasses )
+                        {
                                 // Transform current class name to indent step index.
                         var indentClass = element.$.className.match( this.classNameRegex ),
                                         indentStep = 0;
@@ -233 +273 @@
                         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.hasAttribute && element.hasAttribute( 'dir' ) && element.getAttribute( 'dir' ) || editorDir;
+
+                                var parent = element.getParent();
+                                while ( parent )
+                                {
+                                        if ( parent.hasAttribute && parent.hasAttribute( 'dir' ) )
+                                        {
+                                                dir = parent.getAttribute( 'dir' );
+                                                break;
+                                        }
+                                        parent = parent.getParent();
+                                }
+                                dir = dir.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 )
         {
@@ -344 +405 @@
                                 });
 
                         // Register the state changing handlers.
+                        editor.on( 'selectionChange', onSelectionChangeUpdateDir );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, indent ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, outdent ) );
 

_source/plugins/bidi/plugin.js

@@ -40 +40 @@
          *
          * @param {!CKEDITOR.dom.element} element
          */
+
         function switchDir( element, dir, editor )
         {
-                if ( element.hasAttribute( 'dir' ) && element.getAttribute( 'dir' ).toLowerCase()  == dir )
-                        element.removeAttribute( 'dir' );
+                var switchMargin,
+                        editorDir = ( editor.config.contentsLangDirection == 'ui' )
+                                ? editor.lang.dir : editor.config.contentsLangDirection;
+
+                if ( element.hasAttribute( 'dir' ) )
+                {
+                        if ( element.getAttribute( 'dir' ).toLowerCase() == dir )
+                        {
+                                if ( dir != editorDir )
+                                        switchMargin = dir == 'rtl' ? 'ltr' : 'rtl';
+                                element.removeAttribute( '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 );
+                        }
+                }
+        }
 
         /**
          *