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.1.0 - Released 12/16/2009
[extjs.git]
/
src
/
widgets
/
layout
/
CardLayout.js
diff --git
a/src/widgets/layout/CardLayout.js
b/src/widgets/layout/CardLayout.js
index
6c3c902
..
1da6130
100644
(file)
--- a/
src/widgets/layout/CardLayout.js
+++ b/
src/widgets/layout/CardLayout.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.
0
.0
+ * Ext JS Library 3.
1
.0
* 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
@@
-93,7
+93,7
@@
Ext.layout.CardLayout = Ext.extend(Ext.layout.FitLayout, {
\r
constructor: function(config){
\r
Ext.layout.CardLayout.superclass.constructor.call(this, config);
\r
\r
constructor: function(config){
\r
Ext.layout.CardLayout.superclass.constructor.call(this, config);
\r
- this.forceLayout = (this.deferredRender === false);
\r
+
//
this.forceLayout = (this.deferredRender === false);
\r
},
\r
\r
/**
\r
},
\r
\r
/**
\r
@@
-101,17
+101,23
@@
Ext.layout.CardLayout = Ext.extend(Ext.layout.FitLayout, {
* @param {String/Number} item The string component id or numeric index of the item to activate
\r
*/
\r
setActiveItem : function(item){
\r
* @param {String/Number} item The string component id or numeric index of the item to activate
\r
*/
\r
setActiveItem : function(item){
\r
+ var ai = this.activeItem;
\r
item = this.container.getComponent(item);
\r
item = this.container.getComponent(item);
\r
- if(this.activeItem != item){
\r
- if(this.activeItem){
\r
- this.activeItem.hide();
\r
+ if(ai != item){
\r
+ if(ai){
\r
+ ai.hide();
\r
+ ai.fireEvent('deactivate', ai);
\r
}
\r
}
\r
+ var layout = item.doLayout && (this.layoutOnCardChange || !item.rendered);
\r
this.activeItem = item;
\r
this.activeItem = item;
\r
- item.show();
\r
- this.container.doLayout();
\r
- if(this.layoutOnCardChange && item.doLayout){
\r
+ if(item){
\r
+ item.show();
\r
+ }
\r
+ this.layout();
\r
+ if(item && layout){
\r
item.doLayout();
\r
}
\r
item.doLayout();
\r
}
\r
+ item.fireEvent('activate', item);
\r
}
\r
},
\r
\r
}
\r
},
\r
\r