Ticket #6510: 6510_2.patch

_source/plugins/bidi/plugin.js

@@ -123 +123 @@
                 // the element and all its children, so it will get really reflected
                 // like a mirror. (#5910)
                 if ( dir != dirBefore )
-                        editor.fire( 'dirChanged', element );
+                {
+                        editor.fire( 'dirChanged',
+                                {
+                                        node : element,
+                                        dir : dir
+                                } );
+                }
 
                 editor.forceNextSelectionCheck();
 

_source/plugins/justify/plugin.js

@@ -87 +87 @@
                 var editor = e.editor;
 
                 var range = new CKEDITOR.dom.range( editor.document );
-                range.setStartBefore( e.data );
-                range.setEndAfter( e.data );
+                range.setStartBefore( e.data.node );
+                range.setEndAfter( e.data.node );
 
                 var walker = new CKEDITOR.dom.walker( range ),
                         node;
@@ -98 +98 @@
                         if ( node.type == CKEDITOR.NODE_ELEMENT )
                         {
                                 // A child with the defined dir is to be ignored.
-                                if ( !node.equals( e.data ) && node.getDirection() )
+                                if ( !node.equals( e.data.node ) && node.getDirection() )
                                 {
                                         range.setStartAfter( node );
                                         walker = new CKEDITOR.dom.walker( range );
@@ -106 +106 @@
                                 }
 
                                 // Switch the alignment.
+                                var classes = editor.config.justifyClasses;
+                                if ( classes )
+                                {
+                                        // The left align class.
+                                        if ( node.hasClass( classes[ 0 ] ) )
+                                        {
+                                                node.removeClass( classes[ 0 ] );
+                                                node.addClass( classes[ 2 ] );
+                                        }
+                                        // The right align class.
+                                        else if ( node.hasClass( classes[ 2 ] ) )
+                                        {
+                                                node.removeClass( classes[ 2 ] );
+                                                node.addClass( classes[ 0 ] );
+                                        }
+                                }
+
+                                // Always switch CSS margins.
                                 var style = 'text-align';
                                 var align = node.getStyle( style );
 

_source/plugins/indent/plugin.js

@@ -392 +392 @@
                         editor.on( 'dirChanged', function( e )
                         {
                                 var range = new CKEDITOR.dom.range( editor.document );
-                                range.setStartBefore( e.data );
-                                range.setEndAfter( e.data );
+                                range.setStartBefore( e.data.node );
+                                range.setEndAfter( e.data.node );
 
                                 var walker = new CKEDITOR.dom.walker( range ),
                                         node;
@@ -403 +403 @@
                                         if ( node.type == CKEDITOR.NODE_ELEMENT )
                                         {
                                                 // A child with the defined dir is to be ignored.
-                                                if ( !node.equals( e.data ) && node.getDirection() )
+                                                if ( !node.equals( e.data.node ) && node.getDirection() )
                                                 {
                                                         range.setStartAfter( node );
                                                         walker = new CKEDITOR.dom.walker( range );
                                                         continue;
                                                 }
 
+                                                // Switch alignment classes.
+                                                var classes = editor.config.indentClasses;
+                                                if ( classes )
+                                                {
+                                                        var suffix = ( e.data.dir == 'ltr' ) ? [ '_rtl', '' ] : [ '', '_rtl' ];
+                                                        for ( var i = 0; i < classes.length; i++ )
+                                                        {
+                                                                if ( node.hasClass( classes[ i ] + suffix[ 0 ] ) )
+                                                                {
+                                                                        node.removeClass( classes[ i ] + suffix[ 0 ] );
+                                                                        node.addClass( classes[ i ] + suffix[ 1 ] );
+                                                                }
+                                                        }
+                                                }
+
                                                 // Switch the margins.
                                                 var marginLeft = node.getStyle( 'margin-right' ),
                                                         marginRight = node.getStyle( 'margin-left' );