src/JsRender/NodeToJs.vala

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

diff --git a/src/JsRender/NodeToJs.vala b/src/JsRender/NodeToJs.vala
index 7825b40..64af1b8 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",niter.get_key());
                        this.addLine(this.pad + piter.get_key() + " : [", 0);
                        
                        var pliter = piter.get_value().list_iterator();
@@ -275,7 +276,7 @@ public class JsRender.NodeToJs : Object {
        *
        */
 
-       char last_line_end = 0; 
+       char last_line_end = '!'; 
        
        /**
        * add a line - note we will end up with an extra line break 
@@ -558,9 +559,6 @@ public class JsRender.NodeToJs : Object {
                
                                        this.out_props.set("'|xns'", "'" +  nstr + "'" );
                                }
-               
-
-               }