X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Ftoolbar%2Fplugin.js;h=c1701a4808c1c03ad726d6100d04cb21469b953f;hb=c6e377a02b54abc07129d72b632763c727476a15;hp=58e7a28a00be1654372ce070aecdd219d70e5b1d;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/plugins/toolbar/plugin.js b/_source/plugins/toolbar/plugin.js
index 58e7a28..c1701a4 100644
--- a/_source/plugins/toolbar/plugin.js
+++ b/_source/plugins/toolbar/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -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,21 +252,26 @@ 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;
 										contents.setStyle( 'height', ( contentHeight - dy ) + 'px' );
+
+										editor.fire( 'resize' );
 									},
 
 									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' );
@@ -364,7 +369,7 @@ CKEDITOR.config.toolbar_Full =
 	['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],
 	'/',
 	['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],
-	['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],
+	['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	['Link','Unlink','Anchor'],
 	['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
@@ -404,9 +409,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;