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.5.3
[ckeditor.git]
/
_source
/
plugins
/
menubutton
/
plugin.js
diff --git
a/_source/plugins/menubutton/plugin.js
b/_source/plugins/menubutton/plugin.js
index
4797a4e
..
5976322
100644
(file)
--- a/
_source/plugins/menubutton/plugin.js
+++ b/
_source/plugins/menubutton/plugin.js
@@
-1,11
+1,11
@@
/*
\r
/*
\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
CKEDITOR.plugins.add( 'menubutton',
\r
{
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
CKEDITOR.plugins.add( 'menubutton',
\r
{
\r
- requires : [ 'button', 'contextmenu' ],
\r
+ requires : [ 'button', 'menu' ],
\r
beforeInit : function( editor )
\r
{
\r
editor.ui.addHandler( CKEDITOR.UI_MENUBUTTON, CKEDITOR.ui.menuButton.handler );
\r
beforeInit : function( editor )
\r
{
\r
editor.ui.addHandler( CKEDITOR.UI_MENUBUTTON, CKEDITOR.ui.menuButton.handler );
\r
@@
-35,19
+35,24
@@
CKEDITOR.UI_MENUBUTTON = 5;
var menu = _.menu;
\r
if ( !menu )
\r
{
\r
var menu = _.menu;
\r
if ( !menu )
\r
{
\r
- menu = _.menu = new CKEDITOR.plugins.contextMenu( editor );
\r
+ menu = _.menu = new CKEDITOR.menu( editor,
\r
+ {
\r
+ panel:
\r
+ {
\r
+ className : editor.skinClass + ' cke_contextmenu',
\r
+ attributes : { 'aria-label' : editor.lang.common.options }
\r
+ }
\r
+ });
\r
\r
menu.onHide = CKEDITOR.tools.bind( function()
\r
{
\r
\r
menu.onHide = CKEDITOR.tools.bind( function()
\r
{
\r
- this.setState( _.previousState );
\r
+ this.setState( this.modes && this.modes[ editor.mode ] ? _.previousState : CKEDITOR.TRISTATE_DISABLED );
\r
},
\r
this );
\r
\r
// Initialize the menu items at this point.
\r
if ( this.onMenu )
\r
},
\r
this );
\r
\r
// Initialize the menu items at this point.
\r
if ( this.onMenu )
\r
- {
\r
menu.addListener( this.onMenu );
\r
menu.addListener( this.onMenu );
\r
- }
\r
}
\r
\r
if ( _.on )
\r
}
\r
\r
if ( _.on )
\r