Ticket #5910: 5910.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 )
-                        {
-                                // Transform current class name to indent step index.
+        {
+                console.log( this.indentCssProperty );
+                if ( this.useIndentClasses )
+                {
+                        // Transform current class name to indent step index.
                         var indentClass = element.$.className.match( this.classNameRegex ),
-                                        indentStep = 0;
-                                if ( indentClass )
-                                {
-                                        indentClass = indentClass[1];
-                                        indentStep = this.indentClassMap[ indentClass ];
-                                }
+                                indentStep = 0;
+                        if ( indentClass )
+                        {
+                                indentClass = indentClass[1];
+                                indentStep = this.indentClassMap[ indentClass ];
+                        }
 
-                                // Operate on indent step index, transform indent step index back to class
-                                // name.
-                                if ( this.name == 'outdent' )
-                                        indentStep--;
-                                else
-                                        indentStep++;
+                        // Operate on indent step index, transform indent step index back to class
+                        // name.
+                        if ( this.name == 'outdent' )
+                                indentStep--;
+                        else
+                                indentStep++;
 
                         if ( indentStep < 0 )
                                 return false;
 
-                                indentStep = Math.min( indentStep, editor.config.indentClasses.length );
-                                indentStep = Math.max( indentStep, 0 );
+                        indentStep = Math.min( indentStep, editor.config.indentClasses.length );
+                        indentStep = Math.max( indentStep, 0 );
                         var className = CKEDITOR.tools.ltrim( element.$.className.replace( this.classNameRegex, '' ) );
-                                if ( indentStep < 1 )
+                        if ( indentStep < 1 )
                                 element.$.className = className;
-                                else
+                        else
                                 element.addClass( editor.config.indentClasses[ indentStep - 1 ] );
-                        }
-                        else
-                        {
+                }
+                else
+                {
                         var currentOffset = parseInt( element.getStyle( this.indentCssProperty ), 10 );
-                                if ( isNaN( currentOffset ) )
-                                        currentOffset = 0;
-                                currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
+                        if ( isNaN( currentOffset ) )
+                                currentOffset = 0;
+                        currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
 
                         if ( currentOffset < 0 )
                                 return false;
 
-                                currentOffset = Math.max( currentOffset, 0 );
-                                currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
+                        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' );
-                        }
+                }
 
                 return true;
-                }
+        }
 
         function indentCommand( editor, name )
         {
@@ -344 +385 @@
                                 });
 
                         // 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 ) );