vanilla ckeditor-3.1

[ckeditor.git] / _source / plugins / toolbar / plugin.js

diff --git a/_source/plugins/toolbar/plugin.js b/_source/plugins/toolbar/plugin.js
index 58e7a28..5a3d834 100644 (file)
--- a/_source/plugins/toolbar/plugin.js
+++ b/_source/plugins/toolbar/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -113,7 +113,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                editor.toolbox = new toolbox();\r
 \r
                                                var output = [ '<div class="cke_toolbox"' ],\r
-                                                       expanded =  editor.config.toolbarStartupExpanded,\r
+                                                       expanded =  editor.config.toolbarStartupExpanded !== false,\r
                                                        groupStarted;\r
 \r
                                                output.push( expanded ? '>' : ' style="display:none">' );\r
@@ -252,11 +252,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                                {\r
                                                                                        toolbox.hide();\r
                                                                                        collapser.addClass( 'cke_toolbox_collapser_min' );\r
+                                                                                       collapser.setAttribute( 'title', editor.lang.toolbarExpand );\r
                                                                                }\r
                                                                                else\r
                                                                                {\r
                                                                                        toolbox.show();\r
                                                                                        collapser.removeClass( 'cke_toolbox_collapser_min' );\r
+                                                                                       collapser.setAttribute( 'title', editor.lang.toolbarCollapse );\r
                                                                                }\r
 \r
                                                                                var dy = toolboxContainer.$.offsetHeight - previousHeight;\r
@@ -266,7 +268,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        modes : { wysiwyg : 1, source : 1 }\r
                                                                } );\r
 \r
-                                                       output.push( '<a id="' + collapserId + '" class="cke_toolbox_collapser' );\r
+                                                       output.push( '<a title="' + ( expanded ? editor.lang.toolbarCollapse : editor.lang.toolbarExpand )\r
+                                                                                                         + '" id="' + collapserId + '" class="cke_toolbox_collapser' );\r
 \r
                                                        if ( !expanded )\r
                                                                output.push( ' cke_toolbox_collapser_min' );\r
@@ -364,7 +367,7 @@ CKEDITOR.config.toolbar_Full =
        ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'],\r
        '/',\r
        ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],\r
-       ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],\r
+       ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],\r
        ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],\r
        ['Link','Unlink','Anchor'],\r
        ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],\r
@@ -404,9 +407,9 @@ CKEDITOR.config.toolbarCanCollapse = true;
 \r
 /**\r
  * Whether the toolbar must start expanded when the editor is loaded.\r
+ * @name CKEDITOR.config.toolbarStartupExpanded\r
  * @type Boolean\r
  * @default true\r
  * @example\r
  * config.toolbarStartupExpanded = false;\r
  */\r
-CKEDITOR.config.toolbarStartupExpanded = true;\r