X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=builder.html.js;h=875e9e9a8850536c500034570081f54c0f6b19a7;hp=fc556e7f900ba8a4a29464d279873076075401a7;hb=refs%2Fheads%2Forigin.gitlive;hpb=5ed73a0396c6b4f2c3e742e98cd9fb3585b266dd

diff --git a/builder.html.js b/builder.html.js
index fc556e7f9..875e9e9a8 100644
--- a/builder.html.js
+++ b/builder.html.js
@@ -1,16 +1,24 @@
 //<script type="text/javascript">
  
 
+var MODULE = { isBuilder : true };
+// BC
+var _this = MODULE;
+
+// the apprenderer.
 Builder  = {
     
     render : function(data)
     {
-         
-        this.tree = data;
+        // for debugging 
+         //console.log(data);        return;
         
+        
+        this.tree = data;
+        MODULE = { isBuilder : true }; 
+        _this = MODULE;
         if (!Builder.click) {
             Builder.click= Roo.get(document.body).on('click', this.onclick, this);
-         
         }
         
         this.redraw(false);
@@ -82,6 +90,7 @@ Builder  = {
         
         
         this.munge(cfg);
+        this.cfg = cfg;
         //console.log(this.dump(cfg)); 
         // we draw either a dialog or a tab..
         
@@ -97,9 +106,10 @@ Builder  = {
                 id : cfg.id
             });
             
-            this.dialog = new Roo[cfg.xtype](this.dialogroot, cfg);
+            
+            MODULE.dialog = new Roo[cfg.xtype](this.dialogroot, cfg);
             //this.dialog.el.on('click', this.panelClick, this);
-            this.dialog.show();
+            MODULE.dialog.show();
             return;
             
         }
@@ -129,6 +139,7 @@ Builder  = {
         }
         try {
             console.log("ADDING CFG");    
+            console.log(cfg)
             this.layoutbase.addxtype(  cfg ); 
         } catch (e) {
             console.log("GOT ERROR?");    
@@ -150,6 +161,7 @@ Builder  = {
         if (!cfg.id) {
             this.dump(cfg);
         }
+        
         //console.log(cfg.xtype + ': ' + cfg.id);
         
         if (cfg.items) {
@@ -180,16 +192,19 @@ Builder  = {
                     delete cfg[p];
                     continue;
                 }
+                var pp = p.charAt(0) == '|'  ? p.substring(1) : p;
                 try {
+                    
+                    
                     var _tmp = false;
                     
-                    var _this = this.renderObj; /// fake '_this' object..
+                    /** eval:var:MOUDULE **/
                     /** eval:var:_this **/
                     /** eval:var:_tmp **/
                     // stupid IE can not return objects evaluated..
                    // console.log('_tmp =(' + cfg[p] + ')');
                     eval('_tmp =(' + cfg[p] + ')');
-                    cfg[isListener ? p : p.substr(1)] = _tmp;
+                    cfg[pp] = _tmp;
                     
                     //if (typeof(_tmp) == 'undefined') {
                     //    alert(cfg[p]);
@@ -198,7 +213,10 @@ Builder  = {
                 } catch(e) {  
                     console.log('Error evaluating: '  + cfg[p] + "\r\n" + JSON.stringify(e)); 
                 };
-                delete cfg[p];
+                if (pp != p) {
+                    delete cfg[p];
+                }
+                
                     
                 
                 continue;
@@ -228,9 +246,11 @@ Builder  = {
                 throw "Invalid Xtype " + cfg.xtype + ' on ' + cfg.xtreepath;
             }
         }
-        
+        if (!isListener) {
+            cfg.listeners = cfg.listeners || {};
+        }
         // we can overlay some event handlers here..
-        cfg.listeners = cfg.listeners || {};
+        
        
         //console.log('xtype'  + xtype)
         switch(xtype) {
@@ -249,6 +269,7 @@ Builder  = {
         
         // now for all the children.. (items)
         if (xitems === false) {
+            
             return;
         }
         cfg.items = [];
@@ -289,7 +310,7 @@ Builder  = {
         if (cfg.items.length == 0) {
             delete cfg.items;
         }
-        
+        console.log(cfg);
         
         
     },
@@ -356,7 +377,7 @@ Builder  = {
         }
         // needs fixing..
         if (ftg.dom.className.match(/[0-9]+/)) {
-            console.log(ftg.dom.className);
+            //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] );