src/JsRender/NodeToJs.vala

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

diff --git a/src/JsRender/NodeToJs.vala b/src/JsRender/NodeToJs.vala
index 0a3a67f..d663bd0 100644 (file)
--- a/src/JsRender/NodeToJs.vala
+++ b/src/JsRender/NodeToJs.vala
@@ -184,8 +184,13 @@ public class JsRender.NodeToJs : Object {
                         
                        var k = iter.get();
                        var v = this.out_props.get(k);
-                       this.node.setLine(this.cur_line, "p",k); //listener
+                       this.node.setLine(this.cur_line, "p",k); 
                        this.addLine(this.pad + k + " : " + v + suffix, ',');
+                       this.node.setLine(this.cur_line, "p","| xns" ); 
+                       if (k == "xns") {
+                               this.addLine(this.pad + "'|xns' : '" + v + "'", ',');
+                       }
+                       
                        this.node.setLine(this.cur_line, "e", "");
                        
                }
@@ -215,7 +220,7 @@ public class JsRender.NodeToJs : Object {
                
                
                
-               
+               this.node.line_end = this.cur_line;
                
                // * prop
 
@@ -225,10 +230,7 @@ public class JsRender.NodeToJs : Object {
                        var addstr = this.mungeChildNew(this.pad + indent_str, niter.get_value());
                        this.node.setLine(this.cur_line, "p",niter.get_key());
                        this.addLine(this.pad + niter.get_key() + " : " + addstr, ',');
-                       if (niter.get_key() == "xns") {
-                               this.addLine(this.pad + "'|xns' : '" + addstr + "'", ',');
-
-                       }
+                       
                        this.node.setLine(this.cur_line, "e", "");
                }                        
                // prop arrays...
@@ -263,7 +265,7 @@ public class JsRender.NodeToJs : Object {
                        this.closeLine();
                        this.addLine(this.pad +   "]",',');
                }
-               
+               this.node.setLine(this.cur_line, "e", "");
                this.closeLine();
                if (this.node.props.has_key("* xinclude")) {
                        this.addLine(spad + "})",0);
@@ -274,7 +276,7 @@ public class JsRender.NodeToJs : Object {
                
                this.node.sortLines();
                
-               this.node.line_end = this.cur_line;
+               
                
                return this.ret;