Ticket #6099: 6099_2.patch

_source/plugins/bidi/plugin.js

@@ -22 +22 @@
 
                 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 = editor.getSelection().getCommonAncestor();
 
-                        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.hasAttribute ||
+                                !( selectedElement.hasAttribute( 'dir' ) || selectedElement.getStyle( 'direction' ) )
+                        )
+                        {
+                                var parent = selectedElement.getParent();
+                                if ( !parent )
+                                        break;
+                                selectedElement = parent;
+                        }
+                }
 
                 selectedElement = selectedElement || path.block || path.blockLimit;
 
-                if ( !selectedElement || selectedElement.getName() == 'body' )
-                        return CKEDITOR.TRISTATE_OFF;
-
-                selectedElement = useComputedState ?
+                var selectedElementDir = useComputedState ?
                         selectedElement.getComputedStyle( 'direction' ) :
                         selectedElement.getStyle( 'direction' ) || selectedElement.getAttribute( 'dir' );
 
-                return ( selectedElement == dir ) ?
+                return ( selectedElementDir == dir ) ?
                         CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
         }