allow string based values for comboboxarray

[roojs1] / Roo / BorderLayout.js

diff --git a/Roo/BorderLayout.js b/Roo/BorderLayout.js
index 79b0be9..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(){
-        if(this.updating) return;
+        if(this.updating) {
+            return;
+        }
         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 'ViewPanel': 
                 if(cfg.autoCreate) {
                     ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
                 } else {
@@ -464,39 +467,22 @@ layout.addxtype({
                 }
                 break;
            
-            case 'ViewPanel': 
-            
-                // needs grid and region
+           
+           
                 
-                //var el = this.getRegion(region).el.createChild();
-                var el = this.el.createChild();
-                // create the grid first...
                 
-                var view = new Roo.View(el, cfg.view);
-                delete cfg.view;
-                if (region == 'center' && this.active ) {
-                    cfg.background = false;
-                }
-                ret = new Roo[cfg.xtype](view, cfg); // new panel!!!!!
                 
-                this.add(region, ret);
-                if (cfg.background) {
-                    ret.on('activate', function(gp) {
-                        //if (!gp.grid.rendered) {
-                        //    gp.grid.render();
-                        //}
-                    });
+            default:
+                if (typeof(Roo[cfg.xtype]) != 'undefined') {
+                    
+                    ret = new Roo[cfg.xtype](cfg); // new panel!!!!!
+                    this.add(region, ret);
                 } else {
-                    view.render();
-                }
-                break;
-           
-                
                 
+                    alert("Can not add '" + cfg.xtype + "' to BorderLayout");
+                    return null;
+                }
                 
-            default: 
-                alert("Can not add '" + cfg.xtype + "' to BorderLayout");
-                return null;
              // GridPanel (grid, cfg)
             
         }