Changeset 5837

Timestamp:

08/23/10 13:13:51 (3 years ago)

Author:

tobiasz.cudnik

Message:

Reverted [5833].

Location:

CKEditor/branches/versions/3.4.x/_source

Files:

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

CKEditor/branches/versions/3.4.x/_source/plugins/bidi/plugin.js

@@ -12 +12 @@
         function onSelectionChange( evt )
         {
-                var editor = evt.editor,
-                        path = evt.data.path;
+                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 useComputedState = editor.config.useComputedState,
                         selectedElement;
@@ -38 +42 @@
                         return CKEDITOR.TRISTATE_OFF;
 
-                var selectionDir = useComputedState ?
+                selectedElement = useComputedState ?
                         selectedElement.getComputedStyle( 'direction' ) :
                         selectedElement.getStyle( 'direction' ) || selectedElement.getAttribute( 'dir' );
 
-                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' );
+                return ( selectedElement == dir ) ?
+                        CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
         }
 

CKEditor/branches/versions/3.4.x/_source/plugins/menu/plugin.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -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' + mixedContentClass + '" role="presentation">' ];
+                                var output = [ '<div class="cke_menu" role="presentation">' ];
 
                                 var length = items.length,

CKEditor/branches/versions/3.4.x/_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
 {
@@ -269 +259 @@
 }
 
-.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/branches/versions/3.4.x/_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/branches/versions/3.4.x/_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/branches/versions/3.4.x/_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
 {
@@ -269 +259 @@
 }
 
-.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/branches/versions/3.4.x/_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/branches/versions/3.4.x/_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/branches/versions/3.4.x/_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
 {
@@ -269 +259 @@
 }
 
-.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/branches/versions/3.4.x/_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/branches/versions/3.4.x/_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
 {