git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.0.3 - Released 10/11/2009
[extjs.git]
/
src
/
widgets
/
menu
/
BaseItem.js
diff --git
a/src/widgets/menu/BaseItem.js
b/src/widgets/menu/BaseItem.js
index
7596afe
..
7786029
100644
(file)
--- a/
src/widgets/menu/BaseItem.js
+++ b/
src/widgets/menu/BaseItem.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.0.
0
+ * Ext JS Library 3.0.
3
* Copyright(c) 2006-2009 Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2009 Ext JS, LLC
* licensing@extjs.com
* http://www.extjs.com/license
@@
-146,8
+146,13
@@
Ext.extend(Ext.menu.BaseItem, Ext.Component, {
// private
handleClick : function(e){
// private
handleClick : function(e){
+ var pm = this.parentMenu;
if(this.hideOnClick){
if(this.hideOnClick){
- this.parentMenu.hide.defer(this.clickHideDelay, this.parentMenu, [true]);
+ if(pm.floating){
+ pm.hide.defer(this.clickHideDelay, pm, [true]);
+ }else{
+ pm.deactivateActive();
+ }
}
},
}
},