resources/RooUsage.txt

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

diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala
index 9d53910..25f003c 100644 (file)
--- a/src/JsRender/Roo.vala
+++ b/src/JsRender/Roo.vala
@@ -70,42 +70,28 @@ 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.
         {
             
                                 
-                       print("load Items!");
+                       GLib.debug("load Items!");
                        if (this.tree != null) {
                                return;
                        }
-                       print("load " + this.path);
+                       GLib.debug("load " + this.path);
 
                        var pa = new Json.Parser();
                        pa.load_from_file(this.path);
@@ -141,7 +127,7 @@ namespace JsRender {
                                this.tree.loadFromJson(tree_base, int.parse(bjs_version_str));
                        }
                        this.loaded = true;
-
+                       this.toSource(); // force it to number the lines...
 
             
         }
@@ -150,8 +136,8 @@ namespace JsRender {
        public  override  void save()
        {
             
-               print("--- JsRender.Roo.save");
-               print("save() - reset transStrings\n");
+               GLib.debug("--- JsRender.Roo.save");
+               GLib.debug("save() - reset transStrings\n");
                this.transStrings = new Gee.HashMap<string,string>();
                this.findTransStrings(this.tree);
                
@@ -199,12 +185,12 @@ namespace JsRender {
        {
                 
                var top = this.tree.fqn();
-               print ("TOP = " + top + "\n" );
-               if (top.index_of("Roo.bootstrap.") < 0 &&
-                   top.index_of("Roo.mailer.") < 0
-                       ) {
-                       return;
-               }
+               GLib.debug ("TOP = " + top + "\n" );
+               if (top.index_of("Roo.bootstrap.") < 0 &&
+           top.index_of("Roo.mailer.") < 0
+               ) {
+               return;
+               }
                
                
                //now write the js file..
@@ -229,7 +215,7 @@ namespace JsRender {
                        print("Skip save - templates folder does not exist : %s\n", targetdir);
                        return;
                }
-               print("SAVE HTML -- %s\n%s\n",targetdir + "/" +  bn, html);
+               //print("SAVE HTML -- %s\n%s\n",targetdir + "/" +  bn, html);
                try {
                        this.writeFile(targetdir + "/" +  bn , html);            
                } catch (FileError e ) {
@@ -283,19 +269,24 @@ 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);
+                                       GLib.debug("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;
                                }
                                
                                if (ktype.down() == "string" && kname[0] == '_') {
-                                       print("flag=%s type=%s name=%s : %s\n", kflag,ktype,kname,str);
+                                       GLib.debug("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;
                                }
@@ -315,9 +306,9 @@ namespace JsRender {
                public string  transStringsToJs()
                {
                        
-                       print("Roo.transStringsToJs()\n");
+                       GLib.debug("Roo.transStringsToJs()\n");
                        if (this.transStrings.size < 1) {
-                               print("Roo.transStringsToJs() size < 1?\n");
+                               GLib.debug("Roo.transStringsToJs() size < 1?\n");
                                return "";
                        }
                         
@@ -410,6 +401,13 @@ namespace JsRender {
          * 
          * 
          */
+        public override string toSourceCode() 
+        {
+                       this.transStrings = new Gee.HashMap<string,string>();
+                       this.findTransStrings(this.tree);
+                       return this.toSource();
+               }
+         
         public override string toSource()
         {
             // dump the file tree back out to a string.
@@ -425,10 +423,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);
             }
@@ -467,6 +469,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();