src/JsRender/NodeToJs.vala

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

diff --git a/src/JsRender/NodeToJs.vala b/src/JsRender/NodeToJs.vala
index eb5691f..ef4a931 100644 (file)
--- a/src/JsRender/NodeToJs.vala
+++ b/src/JsRender/NodeToJs.vala
@@ -199,9 +199,9 @@ public class JsRender.NodeToJs : Object {
                                
                                var k = iter.get();
                                var v = this.out_listeners.get(k);
-                               this.addLine(this.pad + indent_str + k + " : ", 0);
                                this.node.setLine(this.cur_line, "l",k); //listener
-                               this.addLine( v,',');
+                               this.addLine(this.pad + indent_str + k + " : " + v , ',');
+                               
                        }
                        
                        this.closeLine();
@@ -220,9 +220,10 @@ public class JsRender.NodeToJs : Object {
                var niter = this.out_nodeprops.map_iterator();
 
                while(niter.next()) {
-                       this.addLine(this.pad + niter.get_key() + " : ", 0);
                        var addstr = this.mungeChildNew(this.pad + indent_str, niter.get_value());
-                       this.addLine(addstr,',') ;
+                       this.node.setLine(this.cur_line, "p",niter.get_key());
+                       this.addLine(this.pad + niter.get_key() + " : " + addstr, ',');
+                       
                        
                }                        
                // prop arrays...
@@ -230,7 +231,7 @@ public class JsRender.NodeToJs : Object {
                var piter = this.out_props_array.map_iterator();
 
                while(piter.next()) {
-
+                       this.node.setLine(this.cur_line, "p", piter.get_key() );
                        this.addLine(this.pad + piter.get_key() + " : [", 0);
                        
                        var pliter = piter.get_value().list_iterator();
@@ -428,15 +429,7 @@ public class JsRender.NodeToJs : Object {
        {
                string left;
                Regex func_regex ;
-
-               if (this.node.props.has_key("$ xns")) {
-                       this.out_props.set("'|xns'", "'" +  this.node.props.get("$ xns") + "'" );
-                       
-                       //this.els.add("'|xns' : '" + this.node.props.get("$ xns") + "'");
-
-               }
-
-               
+ 
                try {
                        func_regex = new Regex("^\\s+|\\s+$");
                } catch (RegexError e) {
@@ -561,6 +554,14 @@ public class JsRender.NodeToJs : Object {
                                        //nstr =  string.joinv("\n", lines);
                                }
                                this.out_props.set(left, nstr);
+                               
+                               if (left == "xns") {
+               
+                                       this.out_props.set("'|xns'", "'" +  nstr + "'" );
+                               }
+
+                               
+                               
                                //print("==> " +  str + "\n");
                                //this.els.add(left + " : "+  nstr);
                                continue;