X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftoolbar%2Fplugin.js;fp=_source%2Fplugins%2Ftoolbar%2Fplugin.js;h=a891c157a28569fb8d16a54135d726828e357ee5;hb=7cd80714081a8ffdf4a1a8d2c72f120ed5ef3d6d;hp=58e7a28a00be1654372ce070aecdd219d70e5b1d;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git

diff --git a/_source/plugins/toolbar/plugin.js b/_source/plugins/toolbar/plugin.js
index 58e7a28..a891c15 100644
--- a/_source/plugins/toolbar/plugin.js
+++ b/_source/plugins/toolbar/plugin.js
@@ -113,7 +113,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 						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,11 +252,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 										{
 											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,7 +268,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 									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,9 +407,9 @@ CKEDITOR.config.toolbarCanCollapse = true;
 
 /**
  * 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;