Ticket #6100: 6100_2.patch

_source/plugins/indent/plugin.js

@@ -385 +385 @@
                                         "       padding-left: 40px;" +
                                         "}" );
                         }
+
+                        // Register dirChanged listener.
+                        editor.on( 'dirChanged', function( e )
+                        {
+                                var range = new CKEDITOR.dom.range( editor.document );
+                                range.setStartBefore( e.data );
+                                range.setEndAfter( e.data );
+                                
+                                var walker = new CKEDITOR.dom.walker( range ),
+                                        node;
+
+                                while ( ( node = walker.next() ) )
+                                {
+                                        if ( node.type == CKEDITOR.NODE_ELEMENT )
+                                        {
+                                                // A child with dir defined is to be ignored.
+                                                if ( !node.equals( e.data ) && 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' );
+                                        }
+                                }
+                        });
                 },
 
                 requires : [ 'domiterator', 'list' ]

_source/plugins/bidi/plugin.js

@@ -67 +67 @@
                 // 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 );
+                        editor.fire( 'dirChanged', 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/dialogadvtab/plugin.js

@@ -36 +36 @@
                 var attrName = this.att,
                         value = this.getValue();
 
+                // Broadcast Lang Dir change
+                if ( attrName == 'dir' )
+                {
+                        var dir = element.getAttribute( attrName, value );
+                        if ( dir != value && element.getParent() )
+                                        this._.dialog._.editor.fire( 'dirChanged', element );
+                }
+
                 if ( value )
                         element.setAttribute( attrName, value );
                 else