Ticket #6041: 6041_2.patch

_source/skins/kama/icons.css

@@ -248 +248 @@
         background-position: 0 -416px;
 }
 
+.cke_skin_kama .cke_mixed_dir_content .cke_button_numberedlist .cke_icon
+{
+        background-position: 0 -1217px;
+}
+
+.cke_skin_kama .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon
+{
+        background-position: 0 -1233px;
+}
+
 .cke_skin_kama .cke_button_outdent .cke_icon
 {
         background-position: 0 -432px;
@@ -258 +268 @@
         background-position: 0 -448px;
 }
 
+.cke_skin_kama .cke_mixed_dir_content .cke_button_indent .cke_icon
+{
+        background-position: 0 -1265px;
+}
+
+.cke_skin_kama .cke_mixed_dir_content .cke_button_outdent .cke_icon
+{
+        background-position: 0 -1249px;
+}
+
 .cke_skin_kama .cke_button_justifyleft .cke_icon
 {
         background-position: 0 -464px;

_source/skins/kama/toolbar.css

@@ -242 +242 @@
 
 .cke_skin_kama .cke_rtl .cke_button .cke_icon
 {
+        background-image: url(icons_rtl.png);
+}
+
+.cke_skin_kama .cke_rtl .cke_button .cke_icon
+{
         float: right;
 }
 

_source/plugins/menu/plugin.js

@@ -221 +221 @@
                                 // Put the items in the right order.
                                 sortItems( items );
 
+                                var chromeRoot = editor.element.getNext().getChild( 1 );
+                                var mixedContentClass = chromeRoot.hasClass( 'cke_mixed_dir_content' ) ? ' cke_mixed_dir_content' : '';
+
                                 // Build the HTML that composes the menu and its items.
-                                var output = [ '<div class="cke_menu" role="presentation">' ];
+                                var output = [ '<div class="cke_menu' + mixedContentClass + '" role="presentation">' ];
 
                                 var length = items.length,
                                         lastGroup = length && items[ 0 ].group;

_source/skins/kama/menu.css

@@ -44 +44 @@
         float: left;
 }
 
+.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon
+{
+        background-image: url(icons_rtl.png);
+}
+
 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon
 {
         filter: alpha(opacity=70); /* IE */

_source/plugins/bidi/plugin.js

@@ -11 +11 @@
 
         function onSelectionChange( evt )
         {
-                evt.editor.getCommand( 'bidirtl' ).setState( getState( evt.editor, evt.data.path, 'rtl' ) );
-                evt.editor.getCommand( 'bidiltr' ).setState( getState( evt.editor, evt.data.path, 'ltr' ) );
-        }
-
-        function getState( editor, path, dir )
-        {
+                var editor = evt.editor,
+                        path = evt.data.path;
                 var useComputedState = editor.config.useComputedState,
                         selectedElement;
 
@@ -41 +37 @@
                 if ( !selectedElement || selectedElement.getName() == 'body' )
                         return CKEDITOR.TRISTATE_OFF;
 
-                selectedElement = useComputedState ?
+                var selectionDir = useComputedState ?
                         selectedElement.getComputedStyle( 'direction' ) :
                         selectedElement.getStyle( 'direction' ) || selectedElement.getAttribute( 'dir' );
 
-                return ( selectedElement == dir ) ?
-                        CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
+                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.element.getNext().getChild( 1 );
+
+                if ( selectionDir != editor.lang.dir )
+                        chromeRoot.addClass( 'cke_mixed_dir_content' );
+                else
+                        chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 
         function switchDir( element, dir, editor )