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.4.2
[ckeditor.git]
/
_source
/
plugins
/
menu
/
plugin.js
diff --git
a/_source/plugins/menu/plugin.js
b/_source/plugins/menu/plugin.js
index
ac45279
..
1ea12b2
100644
(file)
--- a/
_source/plugins/menu/plugin.js
+++ b/
_source/plugins/menu/plugin.js
@@
-190,15
+190,15
@@
CKEDITOR.plugins.add( 'menu',
this._.itemOverFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
clearTimeout( this._.showSubTimeout );
\r
this._.itemOverFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
clearTimeout( this._.showSubTimeout );
\r
- this._.showSubTimeout = CKEDITOR.tools.setTimeout( this._.showSubMenu, editor.config.menu_subMenuDelay, this, [ index ] );
\r
+ this._.showSubTimeout = CKEDITOR.tools.setTimeout( this._.showSubMenu, editor.config.menu_subMenuDelay || 400, this, [ index ] );
\r
},
\r
},
\r
- this);
\r
+ this );
\r
\r
this._.itemOutFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
clearTimeout( this._.showSubTimeout );
\r
},
\r
\r
this._.itemOutFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
clearTimeout( this._.showSubTimeout );
\r
},
\r
- this);
\r
+ this );
\r
\r
this._.itemClickFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
\r
this._.itemClickFn = CKEDITOR.tools.addFunction( function( index )
\r
{
\r
@@
-215,14
+215,17
@@
CKEDITOR.plugins.add( 'menu',
else
\r
this.onClick && this.onClick( item );
\r
},
\r
else
\r
this.onClick && this.onClick( item );
\r
},
\r
- this);
\r
+ this );
\r
}
\r
\r
// Put the items in the right order.
\r
sortItems( items );
\r
\r
}
\r
\r
// Put the items in the right order.
\r
sortItems( items );
\r
\r
+ var chromeRoot = editor.container.getChild( 1 ),
\r
+ mixedContentClass = chromeRoot.hasClass( 'cke_mixed_dir_content' ) ? ' cke_mixed_dir_content' : '';
\r
+
\r
// Build the HTML that composes the menu and its items.
\r
// Build the HTML that composes the menu and its items.
\r
- var output = [ '<div class="cke_menu" role="presentation">' ];
\r
+ var output = [ '<div class="cke_menu' + mixedContentClass + '" role="presentation">' ];
\r
\r
var length = items.length,
\r
lastGroup = length && items[ 0 ].group;
\r
\r
var length = items.length,
\r
lastGroup = length && items[ 0 ].group;
\r
@@
-387,7
+390,6
@@
CKEDITOR.menuItem = CKEDITOR.tools.createClass(
* // Remove the submenu delay.
\r
* config.menu_subMenuDelay = 0;
\r
*/
\r
* // Remove the submenu delay.
\r
* config.menu_subMenuDelay = 0;
\r
*/
\r
-CKEDITOR.config.menu_subMenuDelay = 400;
\r
\r
/**
\r
* A comma separated list of items group names to be displayed in the context
\r
\r
/**
\r
* A comma separated list of items group names to be displayed in the context
\r