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
/
Container.js
diff --git
a/src/widgets/Container.js
b/src/widgets/Container.js
index
b59e710
..
7df8bef
100644
(file)
--- a/
src/widgets/Container.js
+++ b/
src/widgets/Container.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.3.
0
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * 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.Container
*/
/**
* @class Ext.Container
@@
-650,7
+650,7
@@
tb.{@link #doLayout}(); // refresh the layout
c = Ext.ComponentMgr.get(c);
Ext.apply(c, d);
}else if(!c.events){
c = Ext.ComponentMgr.get(c);
Ext.apply(c, d);
}else if(!c.events){
- Ext.applyIf(c, d);
+ Ext.applyIf(c
.isAction ? c.initialConfig : c
, d);
}else{
Ext.apply(c, d);
}
}else{
Ext.apply(c, d);
}