X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=builder.html.js;h=875e9e9a8850536c500034570081f54c0f6b19a7;hb=6d02be081e2257a55c7728fa2cef19aab1079292;hp=703b1b5b160e0d8bf163a9b1759ac06a75814f20;hpb=89a84314c1ca88abe5c96dfeea737a6b70fe90fc;p=app.Builder.js

diff --git a/builder.html.js b/builder.html.js
index 703b1b5b1..875e9e9a8 100644
--- a/builder.html.js
+++ b/builder.html.js
@@ -1,17 +1,24 @@
 //<script type="text/javascript">
  
-var _this = { isBuilder : true };
-   
+
+var MODULE = { isBuilder : true };
+// BC
+var _this = MODULE;
+
+// the apprenderer.
 Builder  = {
     
     render : function(data)
     {
-         
+        // for debugging 
+         //console.log(data);        return;
+        
+        
         this.tree = data;
-        _this = { isBuilder : true };
+        MODULE = { isBuilder : true }; 
+        _this = MODULE;
         if (!Builder.click) {
             Builder.click= Roo.get(document.body).on('click', this.onclick, this);
-         
         }
         
         this.redraw(false);
@@ -83,7 +90,7 @@ Builder  = {
         
         
         this.munge(cfg);
-        
+        this.cfg = cfg;
         //console.log(this.dump(cfg)); 
         // we draw either a dialog or a tab..
         
@@ -100,9 +107,9 @@ Builder  = {
             });
             
             
-            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;
             
         }
@@ -154,6 +161,7 @@ Builder  = {
         if (!cfg.id) {
             this.dump(cfg);
         }
+        
         //console.log(cfg.xtype + ': ' + cfg.id);
         
         if (cfg.items) {
@@ -184,16 +192,19 @@ Builder  = {
                     delete cfg[p];
                     continue;
                 }
+                var pp = p.charAt(0) == '|'  ? p.substring(1) : p;
                 try {
-                    var _tmp = false;
                     
                     
+                    var _tmp = false;
+                    
+                    /** 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]);
@@ -202,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;
@@ -232,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) {
@@ -253,6 +269,7 @@ Builder  = {
         
         // now for all the children.. (items)
         if (xitems === false) {
+            
             return;
         }
         cfg.items = [];
@@ -262,13 +279,13 @@ Builder  = {
             
             var xi = xitems[i];
             if (typeof(xi['*prop']) != 'undefined') {
-                console.log('adding prop:' + xi['*prop']);
+                //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);
+                    //console.log('adding array?:' + pr);
                     pr = pr.replace(/\[\]$/, '');
                     cfg[pr] = cfg[pr]  || [];
                     cfg[pr].push(xi);
@@ -279,7 +296,7 @@ Builder  = {
                 if (xi.xtype && xi.xtype  == 'Array') {
                     cfg[pr] = xi.items;
                 } else {
-                    console.log('setting property:' + pr);
+                    //console.log('setting property:' + pr);
                     cfg[pr] = xi;
                 }
                 
@@ -293,7 +310,7 @@ Builder  = {
         if (cfg.items.length == 0) {
             delete cfg.items;
         }
-        
+        console.log(cfg);
         
         
     },
@@ -360,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] );