Changeset 5997

Timestamp:

10/26/10 09:01:36 (3 years ago)

Author:

tobiasz.cudnik

Message:

#6043 BIDI: When we apply RTL direction to a right aligned Paragraph, Paragraph is not moved to left & Alignment of Paragraph is not changed

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/justify/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -88 +88 @@
                 <li><a href="http://dev.ckeditor.com/ticket/5626">#5626</a> : CKeditor 3.2.1 : html content attached makes ckeditor crash the browser FF/IE.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6508">#6508</a> : BiDi: Margin mirroring logic doesn't honor CSS direction.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6043">#6043</a> : BIDI: When we apply RTL direction to a right aligned Paragraph, Paragraph is not moved to left & Alignment of Paragraph is not changed.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/6427">#6427</a> : Ukrainian;</li>

CKEditor/trunk/_source/plugins/justify/plugin.js

@@ -80 +80 @@
 
                         this.cssClassRegex = new RegExp( '(?:^|\\s+)(?:' + classes.join( '|' ) + ')(?=$|\\s)' );
+                }
+        }
+
+        function onDirChanged( e )
+        {
+                var editor = e.editor;
+
+                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 the defined dir is to be ignored.
+                                if ( !node.equals( e.data ) && node.getDirection() )
+                                {
+                                        range.setStartAfter( node );
+                                        walker = new CKEDITOR.dom.walker( range );
+                                        continue;
+                                }
+
+                                // Switch the alignment.
+                                var style = 'text-align';
+                                var align = node.getStyle( style );
+
+                                if ( align == 'left' )
+                                        node.setStyle( style, 'right' );
+                                else if ( align == 'right' )
+                                        node.setStyle( style, 'left' );
+                        }
                 }
         }
@@ -179 +214 @@
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, center ) );
                         editor.on( 'selectionChange', CKEDITOR.tools.bind( onSelectionChange, justify ) );
+                        editor.on( 'dirChanged', onDirChanged );
                 },