Ticket #6376: 6376.patch

_source/core/dom/element.js

@@ -1552 +1552 @@
                                                 this.setStyle( type, size + 'px' );
                                         }
                                 };
-                })()
+                })(),
+
+                /**
+                 * Checks for element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 */
+                hasDirection : function()
+                {
+                        return !!( this.hasAttribute( 'dir' ) || this.getStyle( 'direction' ) );
+                },
+
+                /**
+                 * Gets element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 */
+                getDirection : function()
+                {
+                        return this.hasDirection() && this.getAttribute( 'dir' ) || this.getStyle( 'direction' );
+                },
+
+                /**
+                 * Removes element's direction. Supports both CSS 'direction' prop and 'dir' attr.
+                 *
+                 * @param direcitonFlag CKEDITOR.DIRECTION_ATTR or CKEDITOR.DIRECTION_CSS
+                 *    Defaults to both.
+                 */
+                removeDirection : function( direcitonFlag )
+                {
+                        if ( direcitonFlag === undefined )
+                                direcitonFlag = CKEDITOR.DIRECTION_ATTR | CKEDITOR.DIRECTION_CSS;
+
+                        if ( direcitonFlag & CKEDITOR.DIRECTION_ATTR )
+                                this.hasAttribute( 'dir ') && this.removeAttribute( 'dir ');
+
+                        if ( direcitonFlag & CKEDITOR.DIRECTION_CSS )
+                                this.removeStyle( 'direction' );
+                }
         });
+
+CKEDITOR.DIRECTION_ATTR = 1;
+CKEDITOR.DIRECTION_CSS = 2;
+ No newline at end of file

_source/plugins/bidi/plugin.js

@@ -52 +52 @@
                         chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 
-        function switchDir( element, dir, editor, state )
+        function switchDir( element, dir, editor )
         {
+                // Stop if direction is same as present.
+                if ( element.hasDirection() && element.getDirection() == dir )
+                        return;
+
                 var dirBefore = element.getComputedStyle( 'direction' );
 
-                element.removeStyle( 'direction' );
-                element.removeAttribute( 'dir' );
-
-                if ( state == CKEDITOR.TRISTATE_OFF && element.getComputedStyle( 'direction' ).toLowerCase() != dir )
-                        element.setAttribute( 'dir', dir );
+                element.setAttribute( 'dir', dir );
 
                 // If the element direction changed, we need to switch the margins of
                 // the element and all its children, so it will get really reflected
@@ -98 +98 @@
                 }
 
                 editor.forceNextSelectionCheck();
+
+                return null;
         }
 
         function getFullySelected( selection, elements )
@@ -136 +138 @@
                                 if ( selectedElement )
                                 {
                                         if ( !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor, this.state );
+                                                switchDir( selectedElement, dir, editor );
                                 }
                                 else
                                 {
@@ -163 +165 @@
 
                                                 while ( ( block = walker.next() ) )
                                                 {
-                                                        switchDir( block, dir, editor, this.state );
+                                                        switchDir( block, dir, editor );
                                                         processedElements.push( block );
                                                 }
 
@@ -199 +201 @@
 
                                                         if ( !_break )
                                                         {
-                                                                switchDir( block, dir, editor, this.state );
+                                                                switchDir( block, dir, editor );
                                                         }
                                                 }
                                         }