Ticket #6865: 6865_3.patch

_source/core/tools.js

@@ -727 +727 @@
                 genKey : function()
                 {
                         return Array.prototype.slice.call( arguments ).join( '-' );
+                },
+
+                /**
+                 * Turn piece of inline style text properties into one hash.
+                 * @param styleText
+                 */
+                parseStyleText : function( styleText )
+                {
+                        var retval = {};
+                        styleText
+                           .replace( /"/g, '"' )
+                           .replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, function( match, name, value )
+                        {
+                                retval[ name ] = value;
+                        } );
+                        return retval;
                 }
         };
 })();

_source/plugins/editingblock/plugin.js

@@ -195 +195 @@
          */
         CKEDITOR.editor.prototype.focus = function()
         {
+                this.forceNextSelectionCheck();
                 var mode = getMode( this );
                 if ( mode )
                         mode.focus();

_source/plugins/bidi/plugin.js

@@ -76 +76 @@
 
         function switchDir( element, dir, editor, database )
         {
+                if ( element.isReadOnly() )
+                        return;
+
                 // Mark this element as processed by switchDir.
                 CKEDITOR.dom.element.setMarker( database, element, 'bidi_processed', 1 );
 
@@ -119 +122 @@
                         // Set new direction for this element.
                         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
-                // like a mirror. (#5910)
-                if ( dir != dirBefore )
-                {
-                        editor.fire( 'dirChanged',
-                                {
-                                        node : element,
-                                        dir : dir
-                                } );
-                }
-
                 editor.forceNextSelectionCheck();
 
                 return null;
@@ -191 +182 @@
                                                 )
                                                 selectedElement = getFullySelected( range, guardElements, enterMode );
 
-                                        if ( selectedElement && !selectedElement.isReadOnly() )
-                                                switchDir( selectedElement, dir, editor, database );
+                                        selectedElement && switchDir( selectedElement, dir, editor, database );
 
                                         var iterator,
                                                 block;
@@ -222 +212 @@
                                         iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
                                         while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
-                                                !block.isReadOnly() && switchDir( block, dir, editor, database );
+                                                switchDir( block, dir, editor, database );
                                         }
 
                                 CKEDITOR.dom.element.clearAllMarkers( database );
@@ -261 +251 @@
                         addButtonCommand( 'BidiRtl', lang.rtl, 'bidirtl', bidiCommand( 'rtl' ) );
 
                         editor.on( 'selectionChange', onSelectionChange );
+                        editor.on( 'contentDom', function()
+                        {
+                                editor.document.on( 'dirChanged', function( evt )
+                                {
+                                        editor.fire( 'dirChanged',
+                                                {
+                                                        node : evt.data,
+                                                        dir : evt.data.getDirection()
+                                                } );
+                                })
+                        });
                 }
         });
 
+        // If the element direction changed, we need to switch the margins of
+        // the element and all its children, so it will get really reflected
+        // like a mirror. (#5910)
+        function dirChangeNotifier( org )
+        {
+                var isAttribute = org == elementProto.setAttribute;
+                return function( name, val )
+                {
+                        if ( !this.getDocument().equals( CKEDITOR.document ) )
+                        {
+                                if ( name == ( isAttribute ? 'dir' : 'direction' ) && this.getDirection() != val )
+                                {
+                                        var retval = org.apply( this, arguments );
+                                        this.getDocument().fire( 'dirChanged', this );
+                                        return retval;
+                                }
+                                else if ( isAttribute && name == 'style' )
+                                        this.setStyles( CKEDITOR.tools.parseStyleText( val ) );
+                        }
+
+                        return org.apply( this, arguments );
+                };
+        }
+
+        var elementProto = CKEDITOR.dom.element.prototype;
+        elementProto.setStyle = CKEDITOR.tools.override( elementProto.setStyle, dirChangeNotifier );
+        elementProto.setAttribute = CKEDITOR.tools.override( elementProto.setAttribute, dirChangeNotifier );
+
 })();
 
 /**

_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 );
-                        if ( dir != value && element.getParent() )
-                                this._.dialog._.editor.fire( 'dirChanged', { node : element, dir : value || element.getDirection( 1 ) } );
-                }
-
                 if ( value )
                         element.setAttribute( attrName, value );
                 else

_source/plugins/styles/plugin.js

@@ -1462 +1462 @@
                                                          .toLowerCase();
         }
 
-        // Turn inline style text properties into one hash.
-        function parseStyleText( styleText )
-        {
-                var retval = {};
-                styleText
-                   .replace( /"/g, '"' )
-                   .replace( /\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g, function( match, name, value )
-                {
-                        retval[ name ] = value;
-                } );
-                return retval;
-        }
-
         /**
          * Compare two bunch of styles, with the speciality that value 'inherit'
          * is treated as a wildcard which will match any value.
@@ -1483 +1470 @@
          */
         function compareCssText( source, target )
         {
-                typeof source == 'string' && ( source = parseStyleText( source ) );
-                typeof target == 'string' && ( target = parseStyleText( target ) );
+                typeof source == 'string' && ( source = CKEDITOR.tools.parseStyleText( source ) );
+                typeof target == 'string' && ( target = CKEDITOR.tools.parseStyleText( target ) );
                 for( var name in source )
                 {
                         if ( !( name in target &&