builder.html.js

[app.Builder.js] / builder.html.js

diff --git a/builder.html.js b/builder.html.js
index 131a651..722525c 100644 (file)
--- a/builder.html.js
+++ b/builder.html.js
@@ -5,6 +5,7 @@ Builder  = {
     
     render : function(data)
     {
+         
         this.tree = data;
         
         if (!Builder.click) {
@@ -43,12 +44,29 @@ Builder  = {
         if (this.layoutbase) {
             //console.log(Builder.dump(this.layoutbase.el));
             
-            this.layoutbase= false;
+            
+            try {
+                var pan = this.layoutbase.getRegion('center').getPanel(0);
+                if (pan) {
+                    this.layoutbase.remove('center', pan);
+                }
+                
+                
+            } catch( e) {
+                console.log(e);
+                console.log(JSON.stringify(e));
+                // reload!!?
+            }
+            
+            
+            
+            //this.layoutbase= false;
         }
          
         
     },
     
+    
     redraw: function(isAuto)
     {
         
@@ -64,7 +82,7 @@ Builder  = {
         
         
         this.munge(cfg);
-        
+        //console.log(this.dump(cfg)); 
         // we draw either a dialog or a tab..
         
         if (cfg.xtype == 'LayoutDialog') {
@@ -78,7 +96,7 @@ Builder  = {
             this.dialogroot = Roo.get( document.body).createChild({
                 id : cfg.id
             });
-             
+            
             this.dialog = new Roo[cfg.xtype](this.dialogroot, cfg);
             //this.dialog.el.on('click', this.panelClick, this);
             this.dialog.show();
@@ -108,9 +126,17 @@ Builder  = {
                     minTabWidth: 140
                 }
             });
-                }
-        this.layoutbase.addxtype(  cfg ); 
-        
+        }
+        try {
+            console.log("ADDING CFG");    
+            this.layoutbase.addxtype(  cfg ); 
+        } catch (e) {
+            console.log("GOT ERROR?");    
+            console.log(e);
+            console.log(typeof(e));
+            
+            console.log(this.dump(e));
+        }
         
         
     },
@@ -166,7 +192,9 @@ Builder  = {
                     //    alert(cfg[p]);
                    // }
                    
-                } catch(e) {  console.log('Error evaluating: '  + cfg[p]); };
+                } catch(e) {  
+                    console.log('Error evaluating: '  + cfg[p] + "\r\n" + JSON.stringify(e)); 
+                };
                 delete cfg[p];
                     
                 
@@ -181,10 +209,27 @@ Builder  = {
               
         }
         
+        if (cfg.xtype && cfg.xtype.match(/^Roo\./) && !cfg.xns) {
+            // xtype contains full path..
+            var bits = cfg.xtype.split('.');
+            bits.shift(); // remove roo..
+            cfg.xtype = bits.pop(); // get the last bit..
+            cfg.xns = Roo;
+            while (bits.length) {
+                cfg.xns = cfg.xns[bits.shift()]; 
+            }
+             
+        }
+        if (cfg.xtype) {
+            if (!cfg.xns || typeof(cfg.xns[cfg.xtype]) == 'undefined') {
+                throw "Invalid Xtype " + cfg.xtype + ' on ' + cfg.xtreepath;
+            }
+        }
+        
         // we can overlay some event handlers here..
         cfg.listeners = cfg.listeners || {};
        
-        console.log('xtype'  + xtype)
+        //console.log('xtype'  + xtype)
         switch(xtype) {
             case 'Roo.LayoutDialog':
                 cfg.listeners.resize = function(dlg, w,h)
@@ -210,10 +255,13 @@ Builder  = {
             
             var xi = xitems[i];
             if (typeof(xi['*prop']) != 'undefined') {
+                console.log('adding prop:' + xi['*prop']);
+                
                 var pr = xi['*prop'];
                 this.munge(xi);
                 // if prop is an array - then it's items are really the value..
                 if (pr.match(/\[\]$/)) {
+                    console.log('adding array?:' + pr);
                     pr = pr.replace(/\[\]$/, '');
                     cfg[pr] = cfg[pr]  || [];
                     cfg[pr].push(xi);
@@ -224,6 +272,7 @@ Builder  = {
                 if (xi.xtype && xi.xtype  == 'Array') {
                     cfg[pr] = xi.items;
                 } else {
+                    console.log('setting property:' + pr);
                     cfg[pr] = xi;
                 }
                 
@@ -303,14 +352,18 @@ Builder  = {
             return true;
         }
         // needs fixing..
-        console.log(ftg.dom.className);
-        var cmat = ftg.dom.className.match(/x-grid-hd-builder-(form-gen-[0-9:]+)/);
-        
-        if (cmat) {
-            this[method]( cmat[1] );
-            return true;
+        if (ftg.dom.className.match(/[0-9]+/)) {
+            console.log(ftg.dom.className);
+            var cmat = ftg.dom.className.match(/x-grid-hd-builder-(form-gen-[0-9:]+)/);
+            if (cmat) {
+                this[method]( cmat[1] );
+                return true;
+            }
         }
         
+        
+        
+        
         return false;
     },