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
/
layout
/
BorderLayout.js
diff --git
a/src/widgets/layout/BorderLayout.js
b/src/widgets/layout/BorderLayout.js
index
07d9275
..
14194d9
100644
(file)
--- a/
src/widgets/layout/BorderLayout.js
+++ b/
src/widgets/layout/BorderLayout.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
1
.1
- * Copyright(c) 2006-2010
Ext JS, LLC
- * 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.layout.BorderLayout
*/
/**
* @class Ext.layout.BorderLayout
@@
-491,7
+491,7
@@
Ext.layout.BorderLayout.Region.prototype = {
this.collapsedEl.on('click', this.onExpandClick, this, {stopEvent:true});
}else {
if(this.collapsible !== false && !this.hideCollapseTool) {
this.collapsedEl.on('click', this.onExpandClick, this, {stopEvent:true});
}else {
if(this.collapsible !== false && !this.hideCollapseTool) {
- var t = this.toolTemplate.append(
+ var t = this.
expandToolEl = this.
toolTemplate.append(
this.collapsedEl.dom,
{id:'expand-'+this.position}, true);
t.addClassOnOver('x-tool-expand-'+this.position+'-over');
this.collapsedEl.dom,
{id:'expand-'+this.position}, true);
t.addClassOnOver('x-tool-expand-'+this.position+'-over');
@@
-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,7
+907,10
@@
Ext.layout.BorderLayout.Region.prototype = {
},
destroy : function(){
},
destroy : function(){
- Ext.destroy(this.miniCollapsedEl, this.collapsedEl);
+ if (this.autoHideSlideTask && this.autoHideSlideTask.cancel){
+ this.autoHideSlideTask.cancel();
+ }
+ Ext.destroyMembers(this, 'miniCollapsedEl', 'collapsedEl', 'expandToolEl');
}
};
}
};
@@
-1145,4
+1148,4
@@
Ext.extend(Ext.layout.BorderLayout.SplitRegion, Ext.layout.BorderLayout.Region,
}
});
}
});
-Ext.Container.LAYOUTS['border'] = Ext.layout.BorderLayout;
\ No newline at end of file
+Ext.Container.LAYOUTS['border'] = Ext.layout.BorderLayout;