Roo/Template.js

[roojs1] / Roo / BorderLayout.js

diff --git a/Roo/BorderLayout.js b/Roo/BorderLayout.js
index 141d726..24c7e48 100644 (file)
--- a/Roo/BorderLayout.js
+++ b/Roo/BorderLayout.js
@@ -372,6 +372,8 @@ layout.addxtype({
     {
         // basically accepts a pannel...
         // can accept a layout region..!?!?
+       // console.log('BorderLayout add ' + cfg.xtype)
+        
         if (!cfg.xtype.match(/Panel$/)) {
             return false;
         }
@@ -390,9 +392,13 @@ layout.addxtype({
         switch(cfg.xtype) 
         {
             case 'ContentPanel':  // ContentPanel (el, cfg)
-            
-                var el = this.el.createChild();
-                ret = new Roo[cfg.xtype](el, cfg); // new panel!!!!!
+                if(cfg.autoCreate) {
+                    ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
+                } else {
+                    var el = this.el.createChild();
+                    ret = new Roo[cfg.xtype](el, cfg); // new panel!!!!!
+                }
+                
                 this.add(region, ret);
                 break;
             
@@ -408,7 +414,10 @@ layout.addxtype({
                 var el = this.el.createChild();
                 var clayout = cfg.layout;
                 delete cfg.layout;
-                
+                clayout.items   = clayout.items  || [];
+                // replace this exitems with the clayout ones..
+                xitems = clayout.items;
+                 
                 
                 if (region == 'center' && this.active && this.getRegion('center').panels.length < 1) {
                     cfg.background = false;
@@ -427,6 +436,8 @@ layout.addxtype({
                 
                 //var el = this.getRegion(region).el.createChild();
                 var el = this.el.createChild();
+                // create the grid first...
+                
                 var grid = new Roo.grid[cfg.grid.xtype](el, cfg.grid);
                 delete cfg.grid;
                 if (region == 'center' && this.active ) {