projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge changes for seperator change
[roojs1]
/
Roo
/
BorderLayout.js
diff --git
a/Roo/BorderLayout.js
b/Roo/BorderLayout.js
index
dec3ad2
..
aeda210
100644
(file)
--- a/
Roo/BorderLayout.js
+++ b/
Roo/BorderLayout.js
@@
-122,7
+122,9
@@
Roo.extend(Roo.BorderLayout, Roo.LayoutManager, {
* Performs a layout update.
*/
layout : function(){
* Performs a layout update.
*/
layout : function(){
- if(this.updating) return;
+ if(this.updating) {
+ return;
+ }
var size = this.getViewSize();
var w = size.width;
var h = size.height;
var size = this.getViewSize();
var w = size.width;
var h = size.height;
@@
-399,6
+401,7
@@
layout.addxtype({
{
case 'ContentPanel': // ContentPanel (el, cfg)
case 'ScrollPanel': // ContentPanel (el, cfg)
{
case 'ContentPanel': // ContentPanel (el, cfg)
case 'ScrollPanel': // ContentPanel (el, cfg)
+ case 'ViewPanel':
if(cfg.autoCreate) {
ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
} else {
if(cfg.autoCreate) {
ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
} else {
@@
-464,12
+467,22
@@
layout.addxtype({
}
break;
}
break;
-
+
+
+
+
+ default:
+ if (typeof(Roo[cfg.xtype]) != 'undefined') {
+
+ ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
+ this.add(region, ret);
+ } else {
+
+ alert("Can not add '" + cfg.xtype + "' to BorderLayout");
+ return null;
+ }
- default:
- alert("Can not add '" + cfg.xtype + "' to BorderLayout");
- return null;
// GridPanel (grid, cfg)
}
// GridPanel (grid, cfg)
}