Ticket #4498: 4498.patch

_source/plugins/toolbar/plugin.js

@@ -113 +113 @@
                                                 editor.toolbox = new toolbox();
 
                                                 var output = [ '<div class="cke_toolbox"' ],
-                                                        expanded =  editor.config.toolbarStartupExpanded,
+                                                        expanded =  editor.config.toolbarStartupExpanded !== false,
                                                         groupStarted;
 
                                                 output.push( expanded ? '>' : ' style="display:none">' );
@@ -252 +252 @@
                                                                                 {
                                                                                         toolbox.hide();
                                                                                         collapser.addClass( 'cke_toolbox_collapser_min' );
+                                                                                        collapser.setAttribute( 'title', editor.lang.toolbarExpand );
                                                                                 }
                                                                                 else
                                                                                 {
                                                                                         toolbox.show();
                                                                                         collapser.removeClass( 'cke_toolbox_collapser_min' );
+                                                                                        collapser.setAttribute( 'title', editor.lang.toolbarCollapse );
                                                                                 }
 
                                                                                 var dy = toolboxContainer.$.offsetHeight - previousHeight;
@@ -266 +268 @@
                                                                         modes : { wysiwyg : 1, source : 1 }
                                                                 } );
 
-                                                        output.push( '<a id="' + collapserId + '" class="cke_toolbox_collapser' );
+                                                        output.push( '<a title="' + ( expanded ? editor.lang.toolbarCollapse : editor.lang.toolbarExpand )
+                                                                                                          + '" id="' + collapserId + '" class="cke_toolbox_collapser' );
 
                                                         if ( !expanded )
                                                                 output.push( ' cke_toolbox_collapser_min' );
@@ -404 +407 @@
 
 /**
  * Whether the toolbar must start expanded when the editor is loaded.
+ * @name CKEDITOR.config.toolbarStartupExpanded
  * @type Boolean
  * @default true
  * @example
  * config.toolbarStartupExpanded = false;
  */
-CKEDITOR.config.toolbarStartupExpanded = true;
+

_source/lang/en.js

@@ -681 +681 @@
                 highlight : 'Highlight',
                 selected : 'Selected',
                 clear : 'Clear'
-        }
+        },
+
+        toolbarCollapse : 'Collapse Toolbar',
+        toolbarExpand : 'Expand Toolbar'
 };