Changeset 5838

Timestamp:

08/23/10 13:17:36 (3 years ago)

Author:

tobiasz.cudnik

Message:

#6041 BIDI: Direction of Increase Indent & Decrease Indent icons are not reversed after changing Lang direction to RTL

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/bidi/plugin.js (modified) (2 diffs)
• _source/plugins/menu/plugin.js (modified) (1 diff)
• _source/skins/kama/icons.css (modified) (2 diffs)
• _source/skins/kama/icons.png (modified) (previous)
• _source/skins/kama/icons_rtl.png (added)
• _source/skins/kama/menu.css (modified) (1 diff)
• _source/skins/kama/toolbar.css (modified) (1 diff)
• _source/skins/office2003/icons.css (modified) (2 diffs)
• _source/skins/office2003/icons.png (modified) (previous)
• _source/skins/office2003/icons_rtl.png (added)
• _source/skins/office2003/menu.css (modified) (1 diff)
• _source/skins/office2003/toolbar.css (modified) (1 diff)
• _source/skins/v2/icons.css (modified) (2 diffs)
• _source/skins/v2/icons.png (modified) (previous)
• _source/skins/v2/icons_rtl.png (added)
• _source/skins/v2/menu.css (modified) (1 diff)
• _source/skins/v2/toolbar.css (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -52 +52 @@
                 <li><a href="http://dev.ckeditor.com/ticket/5956">#5956</a> : [FF] It was impossible to create an editor inside an hidden container.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/5753">#5753</a> : It was impossible to have a default value for the name field in the select dialog.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6041">#6041</a> : BIDI: Direction of Increase Indent & Decrease Indent icons are not reversed after changing Lang direction to RTL.</li>            
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/bidi/plugin.js

@@ -12 +12 @@
         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;
@@ -42 +38 @@
                         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.container.getChild( 1 );
+
+                if ( selectionDir != editor.lang.dir )
+                        chromeRoot.addClass( 'cke_mixed_dir_content' );
+                else
+                        chromeRoot.removeClass( 'cke_mixed_dir_content' );
         }
 

CKEditor/trunk/_source/plugins/menu/plugin.js

@@ -222 +222 @@
                                 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,

CKEditor/trunk/_source/skins/kama/icons.css

@@ -249 +249 @@
 }
 
+.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
 {
@@ -259 +269 @@
 }
 
+.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
 {

CKEditor/trunk/_source/skins/kama/menu.css

@@ -43 +43 @@
         height: 16px;
         float: left;
+}
+
+.cke_rtl .cke_skin_kama .cke_menuitem .cke_icon
+{
+        background-image: url(icons_rtl.png);
 }
 

CKEditor/trunk/_source/skins/kama/toolbar.css

@@ -243 +243 @@
 .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;
 }

CKEditor/trunk/_source/skins/office2003/icons.css

@@ -249 +249 @@
 }
 
+.cke_skin_office2003 .cke_mixed_dir_content .cke_button_numberedlist .cke_icon
+{
+        background-position: 0 -1217px;
+}
+
+.cke_skin_office2003 .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon
+{
+        background-position: 0 -1233px;
+}
+
 .cke_skin_office2003 .cke_button_outdent .cke_icon
 {
@@ -259 +269 @@
 }
 
+.cke_skin_office2003 .cke_mixed_dir_content .cke_button_indent .cke_icon
+{
+        background-position: 0 -1265px;
+}
+
+.cke_skin_office2003 .cke_mixed_dir_content .cke_button_outdent .cke_icon
+{
+        background-position: 0 -1249px;
+}
+
 .cke_skin_office2003 .cke_button_justifyleft .cke_icon
 {

CKEditor/trunk/_source/skins/office2003/menu.css

@@ -43 +43 @@
         height: 16px;
         float: left;
+}
+
+.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_icon
+{
+        background-image: url(icons_rtl.png);
 }
 

CKEditor/trunk/_source/skins/office2003/toolbar.css

@@ -309 +309 @@
 }
 
+.cke_skin_office2003 .cke_rtl .cke_button .cke_icon
+{
+        background-image: url(icons_rtl.png);
+}
+
 .cke_skin_office2003 .cke_button .cke_label
 {

CKEditor/trunk/_source/skins/v2/icons.css

@@ -249 +249 @@
 }
 
+.cke_skin_v2 .cke_mixed_dir_content .cke_button_numberedlist .cke_icon
+{
+        background-position: 0 -1217px;
+}
+
+.cke_skin_v2 .cke_mixed_dir_content .cke_button_bulletedlist .cke_icon
+{
+        background-position: 0 -1233px;
+}
+
 .cke_skin_v2 .cke_button_outdent .cke_icon
 {
@@ -259 +269 @@
 }
 
+.cke_skin_v2 .cke_mixed_dir_content .cke_button_indent .cke_icon
+{
+        background-position: 0 -1265px;
+}
+
+.cke_skin_v2 .cke_mixed_dir_content .cke_button_outdent .cke_icon
+{
+        background-position: 0 -1249px;
+}
+
 .cke_skin_v2 .cke_button_justifyleft .cke_icon
 {

CKEditor/trunk/_source/skins/v2/menu.css

@@ -42 +42 @@
         height: 16px;
         float: left;
+}
+
+.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon
+{
+        background-image: url(icons_rtl.png);
 }
 

CKEditor/trunk/_source/skins/v2/toolbar.css

@@ -282 +282 @@
 }
 
+.cke_skin_v2 .cke_rtl .cke_button .cke_icon
+{
+        background-image: url(icons_rtl.png);
+}
+
 .cke_skin_v2 .cke_button .cke_label
 {