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.0.3 - Released 10/11/2009
[extjs.git]
/
src
/
widgets
/
layout
/
CardLayout.js
diff --git
a/src/widgets/layout/CardLayout.js
b/src/widgets/layout/CardLayout.js
index
6c3c902
..
18f4b70
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.0.
3
* 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
@@
-106,10
+106,11
@@
Ext.layout.CardLayout = Ext.extend(Ext.layout.FitLayout, {
if(this.activeItem){
\r
this.activeItem.hide();
\r
}
\r
if(this.activeItem){
\r
this.activeItem.hide();
\r
}
\r
+ var layout = item.doLayout && (this.layoutOnCardChange || !item.rendered);
\r
this.activeItem = item;
\r
item.show();
\r
this.activeItem = item;
\r
item.show();
\r
- this.
container.doL
ayout();
\r
- if(
this.layoutOnCardChange && item.doL
ayout){
\r
+ this.
l
ayout();
\r
+ if(
l
ayout){
\r
item.doLayout();
\r
}
\r
}
\r
item.doLayout();
\r
}
\r
}
\r