X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=JsParser.js;h=adbc921e97efb0d167e07ce9b2fc56a9b4bbcd44;hb=119290bc3234e9ece1c64dbd72ca486d9633b5b7;hp=fb5d38c2c9df5cba22d7477ccc0bf6e119fb8ef5;hpb=781e0075fc93e1f98960146dd8a418ab9e25e831;p=app.Builder.js

diff --git a/JsParser.js b/JsParser.js
index fb5d38c2c..adbc921e9 100644
--- a/JsParser.js
+++ b/JsParser.js
@@ -19,8 +19,9 @@ Collapse = imports.JSDOC.Collapse.Collapse;
  * Current issues:
  *  - xtype is combined on generated files. (not xns + xtype)
  *  - listeners are prefixed with '|' ... 
- *
- * 
+ *  - modkey is not getting picked up..
+ *  - suspect some of the elements are not getting flattened
+ *  - parent on 
  */
 
 JsParser  =  XObject.define(
@@ -227,11 +228,28 @@ JsParser  =  XObject.define(
                 throw "could not find top props...";
                 
             }
+            //print(JSON.stringify(topp,null,4));
             
             this.cfg = this.parseProps(topp);
-            this.cfg.name = this.tokens[3].data;
+            for(var k in this.cfg) {
+                this.cfg[k.replace(/^\|/, '')] = this.cfg[k];
+            }
+            if (this.cfg.name) {
+                this.cfg.title = this.cfg.name;
+                delete this.cfg.name;
+            }
+           // this.cfg.fullname = this.cfg.name;
             this.cfg.type = 'Roo';
             
+            
+            
+            // looking for parent / name..
+            
+            
+            this.cfg.modOrder = this.cfg.modKey.split('-').shift(); 
+            print(JSON.stringify(this.cfg,null,4));
+            
+            
             //                  (            {          add    { this.panel (  {
             var cfg = this.tokens[7].items[0][0].props.add.val[2].items[2][3].items[0][0].props;
             this.cfg.items = [ this.parseProps(cfg) ];
@@ -247,7 +265,7 @@ JsParser  =  XObject.define(
             
             
             var cfg = this.tokens[2].props.create.val[2].items[1][3].items[0][0].props;
-            his.cfg.type = 'Roo';
+            this.cfg.type = 'Roo';
             //console.dump(this.tokens);
             //print(JSON.stringify(cfg,null,4)); Seed.quit();
             
@@ -404,12 +422,11 @@ JsParser  =  XObject.define(
                             ret[kv] = add;
                             continue;
                         }
-                        var fake_array = {
-                            xtype : 'Array.' + kv,
-                            '*prop' : kv,
-                            items : add
-                        }
-                        fakeItems.push(fake_array);
+                        add.forEach(function(a) {
+                            a['*prop'] = kv + '[]';
+                            fakeItems.push(a);
+                        });
+                        
                         continue;
                     } 
                     // raw array 
@@ -466,8 +483,8 @@ JsParser  =  XObject.define(
                         
                     }
                 }
-               
-                ret[ '|' + kv ] =  this.expand(o[k].val);
+                // finally give up..
+                ret[ '|' + kv ] =  this.clean_body(this.expand(o[k].val));
                 
             }
             if (!ret.items && fakeItems.length) {
@@ -507,7 +524,7 @@ JsParser  =  XObject.define(
         {
             var ret = '';
             //print(JSON.stringify(ar,null,4));
-            
+             
             for(var i =0 ; i < ar.length -1; i++) {
                 ret += ar[i].toRaw();
             }
@@ -549,8 +566,9 @@ JsParser  =  XObject.define(
                 }
                 ar.push(l.substring(mindent));
             });
-            print(str);
-            print(JSON.stringify(ar,null,4));
+            //print(str);
+            //print(JSON.stringify(ar,null,4));
+            
             
             return ar.join("\n");
         },