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.2.1 - Released 04/27/2010
[extjs.git]
/
src
/
widgets
/
layout
/
BorderLayout.js
diff --git
a/src/widgets/layout/BorderLayout.js
b/src/widgets/layout/BorderLayout.js
index
07d9275
..
5564af2
100644
(file)
--- a/
src/widgets/layout/BorderLayout.js
+++ b/
src/widgets/layout/BorderLayout.js
@@
-1,6
+1,6
@@
/*!
/*!
- * Ext JS Library 3.
1
.1
- * Copyright(c) 2006-2010 Ext JS,
LLC
+ * Ext JS Library 3.
2
.1
+ * Copyright(c) 2006-2010 Ext JS,
Inc.
* licensing@extjs.com
* http://www.extjs.com/license
*/
* licensing@extjs.com
* http://www.extjs.com/license
*/
@@
-688,15
+688,15
@@
Ext.layout.BorderLayout.Region.prototype = {
initAutoHide : function(){
if(this.autoHide !== false){
if(!this.autoHideHd){
initAutoHide : function(){
if(this.autoHide !== false){
if(!this.autoHideHd){
-
var st
= new Ext.util.DelayedTask(this.slideIn, this);
+
this.autoHideSlideTask
= new Ext.util.DelayedTask(this.slideIn, this);
this.autoHideHd = {
"mouseout": function(e){
if(!e.within(this.el, true)){
this.autoHideHd = {
"mouseout": function(e){
if(!e.within(this.el, true)){
-
st
.delay(500);
+
this.autoHideSlideTask
.delay(500);
}
},
"mouseover" : function(e){
}
},
"mouseover" : function(e){
-
st
.cancel();
+
this.autoHideSlideTask
.cancel();
},
scope : this
};
},
scope : this
};
@@
-907,6
+907,9
@@
Ext.layout.BorderLayout.Region.prototype = {
},
destroy : function(){
},
destroy : function(){
+ if (this.autoHideSlideTask && this.autoHideSlideTask.cancel){
+ this.autoHideSlideTask.cancel();
+ }
Ext.destroy(this.miniCollapsedEl, this.collapsedEl);
}
};
Ext.destroy(this.miniCollapsedEl, this.collapsedEl);
}
};