Ticket #6099: 6099_7.patch

_source/plugins/bidi/plugin.js

@@ -6 +6 @@
 (function()
 {
         var guardElements = { table:1, ul:1, ol:1, blockquote:1, div:1 },
-                directSelectionGuardElements = {};
+                directSelectionGuardElements = {},
+                stateGuardElements = {};
         CKEDITOR.tools.extend( directSelectionGuardElements, guardElements, { tr:1, p:1, div:1, li:1 } );
+        CKEDITOR.tools.extend( stateGuardElements, directSelectionGuardElements, { td:1 } );
 
-        function onSelectionChange( evt )
+        function onSelectionChange( e )
         {
+                setToolbarStates( e );
+                handleMixedDirContent( e );
+        }
+
+        function setToolbarStates( evt )
+        {
                 var editor = evt.editor,
                         path = evt.data.path;
                 var useComputedState = editor.config.useComputedState,
@@ -18 +26 @@
 
                 useComputedState = useComputedState === undefined || useComputedState;
 
-                if ( useComputedState )
+                // We can use computedState provided by the browser or traverse parents manually.
+                if ( !useComputedState )
                 {
-                        var selection = editor.getSelection(),
-                                ranges = selection.getRanges();
+                        selectedElement = path.lastElement;
 
-                        selectedElement = ranges && ranges[ 0 ].getEnclosedNode();
-
-                        // If this is not our element of interest, apply to fully selected elements from guardElements.
-                        if ( !selectedElement || selectedElement
-                                        && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )
-                                )
-                                selectedElement = getFullySelected( selection, guardElements );
-                }
+                        while ( !( selectedElement.getName() in stateGuardElements || selectedElement.is( 'body' ) ) )
+                        {
+                                var parent = selectedElement.getParent();
+                                if ( !parent )
+                                        break;
+                                
+                                selectedElement = parent;
+                        }
+                }
 
                 selectedElement = selectedElement || path.block || path.blockLimit;
 
@@ -43 +52 @@
 
                 editor.getCommand( 'bidirtl' ).setState( selectionDir == 'rtl' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
                 editor.getCommand( 'bidiltr' ).setState( selectionDir == 'ltr' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );
+        }
 
-                var chromeRoot = editor.container.getChild( 1 );
-
-                if ( selectionDir != editor.lang.dir )
+        function handleMixedDirContent( evt )
+        {
+                var editor = evt.editor,
+                        chromeRoot = editor.container.getChild( 1 ),
+                        node = evt.data.path.elements[ 0 ];
+                
+                if ( node && editor.lang.dir != evt.data.path.elements[ 0 ].getComputedStyle( 'direction' ) )
                         chromeRoot.addClass( 'cke_mixed_dir_content' );
                 else
                         chromeRoot.removeClass( 'cke_mixed_dir_content' );