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.3.1 - Released 11/30/2010
[extjs.git]
/
src
/
widgets
/
Button.js
diff --git
a/src/widgets/Button.js
b/src/widgets/Button.js
index
1689dd0
..
b6d363a
100644
(file)
--- a/
src/widgets/Button.js
+++ b/
src/widgets/Button.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.3.
0
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.3.
1
+ * Copyright(c) 2006-2010
Sencha
Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
/**
* @class Ext.Button
*/
/**
* @class Ext.Button
@@
-194,6
+194,11
@@
Ext.Button = Ext.extend(Ext.BoxComponent, {
*/
initComponent : function(){
*/
initComponent : function(){
+ if(this.menu){
+ this.menu = Ext.menu.MenuMgr.get(this.menu);
+ this.menu.ownerCt = this;
+ }
+
Ext.Button.superclass.initComponent.call(this);
this.addEvents(
Ext.Button.superclass.initComponent.call(this);
this.addEvents(
@@
-256,8
+261,9
@@
Ext.Button = Ext.extend(Ext.BoxComponent, {
*/
'menutriggerout'
);
*/
'menutriggerout'
);
- if(this.menu){
- this.menu = Ext.menu.MenuMgr.get(this.menu);
+
+ if (this.menu){
+ this.menu.ownerCt = undefined;
}
if(Ext.isString(this.toggleGroup)){
this.enableToggle = true;
}
if(Ext.isString(this.toggleGroup)){
this.enableToggle = true;