Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.0.2
[ckeditor.git]
/
_source
/
plugins
/
toolbar
/
plugin.js
diff --git
a/_source/plugins/toolbar/plugin.js
b/_source/plugins/toolbar/plugin.js
index
58e7a28
..
a891c15
100644
(file)
--- 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();
\r
\r
var output = [ '<div class="cke_toolbox"' ],
\r
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
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
{
\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
}
\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
}
\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
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
\r
if ( !expanded )
\r
output.push( ' cke_toolbox_collapser_min' );
\r
@@
-404,9
+407,9
@@
CKEDITOR.config.toolbarCanCollapse = true;
\r
/**
\r
* Whether the toolbar must start expanded when the editor is loaded.
\r
\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
* @type Boolean
\r
* @default true
\r
* @example
\r
* config.toolbarStartupExpanded = false;
\r
*/
\r
-CKEDITOR.config.toolbarStartupExpanded = true;
\r