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.0 - Released 10/06/2010
[extjs.git]
/
pkgs
/
pkg-buttons-debug.js
diff --git
a/pkgs/pkg-buttons-debug.js
b/pkgs/pkg-buttons-debug.js
index
b1dd849
..
3c838bc
100644
(file)
--- a/
pkgs/pkg-buttons-debug.js
+++ b/
pkgs/pkg-buttons-debug.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.
2.2
+ * Ext JS Library 3.
3.0
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
@@
-624,9
+624,7
@@
Ext.Button = Ext.extend(Ext.BoxComponent, {
return;
}
if(!this.disabled){
return;
}
if(!this.disabled){
- if(this.enableToggle && (this.allowDepress !== false || !this.pressed)){
- this.toggle();
- }
+ this.doToggle();
if(this.menu && !this.hasVisibleMenu() && !this.ignoreNextClick){
this.showMenu();
}
if(this.menu && !this.hasVisibleMenu() && !this.ignoreNextClick){
this.showMenu();
}
@@
-637,6
+635,13
@@
Ext.Button = Ext.extend(Ext.BoxComponent, {
}
}
},
}
}
},
+
+ // private
+ doToggle: function(){
+ if (this.enableToggle && (this.allowDepress !== false || !this.pressed)) {
+ this.toggle();
+ }
+ },
// private
isMenuTriggerOver : function(e, internal){
// private
isMenuTriggerOver : function(e, internal){
@@
-926,9
+931,7
@@
Ext.SplitButton = Ext.extend(Ext.Button, {
this.arrowHandler.call(this.scope || this, this, e);
}
}else{
this.arrowHandler.call(this.scope || this, this, e);
}
}else{
- if(this.enableToggle){
- this.toggle();
- }
+ this.doToggle();
this.fireEvent("click", this, e);
if(this.handler){
this.handler.call(this.scope || this, this, e);
this.fireEvent("click", this, e);
if(this.handler){
this.handler.call(this.scope || this, this, e);