src/JsRender/NodeToJs.vala

[app.Builder.js] / src / JsRender / Roo.vala

diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala
index 148eb4a..5209037 100644 (file)
--- a/src/JsRender/Roo.vala
+++ b/src/JsRender/Roo.vala
@@ -70,32 +70,18 @@ namespace JsRender {
             
         }
     
-    /*    
-        setNSID : function(id)
-        {
-            
-            this.items[0]['|module'] = id;
-       
-            
-        },
-        
-        
-        getType: function() {
-            return 'Roo';
-        },
-
-    */
+ 
                
-       public   override void   removeFiles() {
-               var html = GLib.Path.get_dirname(this.path) +"/templates/" + name + ".html";
-               if (FileUtils.test(html, FileTest.EXISTS)) {
-                       GLib.FileUtils.remove(html);
-               }
-               var js = GLib.Path.get_dirname(this.path) +"/" + name + ".html";
-               if (FileUtils.test(js, FileTest.EXISTS)) {
-                       GLib.FileUtils.remove(js);
+               public   override void   removeFiles() {
+                       var html = GLib.Path.get_dirname(this.path) +"/templates/" + name + ".html";
+                       if (FileUtils.test(html, FileTest.EXISTS)) {
+                               GLib.FileUtils.remove(html);
+                       }
+                       var js = GLib.Path.get_dirname(this.path) +"/" + name + ".html";
+                       if (FileUtils.test(js, FileTest.EXISTS)) {
+                               GLib.FileUtils.remove(js);
+                       }
                }
-       }
                
         public  override void  loadItems() throws GLib.Error // : function(cb, sync) == original was async.
         {
@@ -141,83 +127,14 @@ namespace JsRender {
                                this.tree.loadFromJson(tree_base, int.parse(bjs_version_str));
                        }
                        this.loaded = true;
-
+                       this.toSource(); // force it to number the lines...
 
             
         }
-        /**
-         * old code had broken xtypes and used arrays differently,
-         * this code should try and clean it up..
-         * 
-         * 
-         * /
-        fixItems : function(node, fixthis)
-        {
-            if (fixthis) {
-                // fix xtype.
-                var fn = this.guessName(node);
-                //print("guessname got " + fn);
-                if (fn) {
-                    var bits = fn.split('.');
-                    node.xtype = bits.pop();
-                    node['|xns'] = bits.join('.');
-                    
-                }
-                // fix array???
-                 
-                
-            }
-            if (!node.items || !node.items.length) {
-                return;
-            }
-            var _this = this;
-            var aitems = [];
-            var nitems = [];
-            node.items.forEach(function(i) {
-                
-                
-                
-                _this.fixItems(i, true);
-                if (i.xtype == 'Array') {
-                    aitems.push(i);
-                    return;
-                }    
-                nitems.push(i);
-            });
-            node.items = nitems; 
-            
-            if (!aitems.length) {
-                return;
-            }
-            
-            aitems.forEach(function(i) {
-                
-                if (!i.items || !i.items.length) {
-                    return;
-                }
-                var prop = i['*prop'] + '[]';
-                // colModel to cm?
-                i.items.forEach(function(c) {
-                    c['*prop']  = prop;
-                    node.items.push(c);
-                    
-                });
-                
-                
-            });
-            
-            
-            // array handling.. 
-            
-            
-            
-            
-            
-        },
-    */
+        
         
        public  override  void save()
-        {
+       {
             
                print("--- JsRender.Roo.save");
                print("save() - reset transStrings\n");
@@ -259,7 +176,7 @@ namespace JsRender {
             
             
             
-        }
+       }
 
         
 
@@ -352,11 +269,16 @@ namespace JsRender {
                                if (kflag == "$") {
                                        continue;
                                }
+                               // skip cms-id nodes...
+                               if (kname == "html" && node.has("cms-id")) { 
+                                       continue;
+                               }
+                               
                                var str = iter.get_value();
                                if (this.doubleStringProps.index_of(kname) > -1) {
                                        print("flag=%s type=%s name=%s : %s\n", kflag,ktype,kname,str);
                                        this.transStrings.set(str,  
-                                               GLib.Checksum.compute_for_string (ChecksumType.MD5, str)
+                                               GLib.Checksum.compute_for_string (ChecksumType.MD5, str.strip())
                                        );
                                        continue;
                                }
@@ -364,7 +286,7 @@ namespace JsRender {
                                if (ktype.down() == "string" && kname[0] == '_') {
                                        print("flag=%s type=%s name=%s : %s\n", kflag,ktype,kname,str);
                                        this.transStrings.set(str,  
-                                               GLib.Checksum.compute_for_string (ChecksumType.MD5, str)
+                                               GLib.Checksum.compute_for_string (ChecksumType.MD5, str.strip())
                                        );
                                        continue;
                                }
@@ -494,10 +416,14 @@ namespace JsRender {
             if (top == null) {
                 return "";
             }
-            // get the translatable strings..
             
             
             
+            // get the translatable strings.. = we reload them again so calling methods get the right data...
+            this.transStrings = new Gee.HashMap<string,string>();
+                       this.findTransStrings(this.tree);
+            
+            
             if (top.contains("Dialog")) {
                 return this.toSourceDialog(false);
             }
@@ -536,6 +462,7 @@ namespace JsRender {
                                return "";
                        }
                        var x = new NodeToJs(this.tree, this.doubleStringProps, pad, null);
+                       x.renderer = this;
                        x.cur_line = prefix.split("\n").length;
                        
                        var ret = x.munge();