X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FJsRender%2FRoo.vala;h=25f003c592eac3c47b084f9f67e5cb399ecb0aa5;hb=HEAD;hp=69c3fbc28ef41ffd33407dcb811f922f5b81ca63;hpb=15bffa665560e3885edfffdeea2bda6fa28e41a6;p=app.Builder.js

diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala
index 69c3fbc28..25f003c59 100644
--- a/src/JsRender/Roo.vala
+++ b/src/JsRender/Roo.vala
@@ -87,11 +87,11 @@ namespace JsRender {
         {
             
 				 
-			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);
@@ -136,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);
 		
@@ -185,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..
@@ -215,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 ) {
@@ -276,17 +276,17 @@ namespace JsRender {
 				
 				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;
 				}
@@ -306,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 "";
 			}
 			 
@@ -401,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.
@@ -462,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();