Merge branch 'master' of http://git.roojs.com/app.Builder.js

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

diff --git a/src/JsRender/NodeToJs.vala b/src/JsRender/NodeToJs.vala
index b1b5c4e..ee2075d 100644 (file)
--- a/src/JsRender/NodeToJs.vala
+++ b/src/JsRender/NodeToJs.vala
@@ -177,6 +177,11 @@ public class JsRender.NodeToJs : Object {
                // work out remaining items...
         
                // output xns / xtype first..
+               if (this.out_props.has_key("xtype")) {
+                       var v = this.out_props.get("xtype");
+                       this.node.setLine(this.cur_line, "p","xtype"); 
+                       this.addLine(this.pad + "xtype" + " : " + v + suffix, ',');
+               }
                
                // plain properties.
                var iter = this.orderedPropKeys().list_iterator();
@@ -184,14 +189,14 @@ public class JsRender.NodeToJs : Object {
  
                         
                        var k = iter.get();
+                       if (k == "xns" || k == "xtype") {
+                               continue;
+                       }
+
                        var v = this.out_props.get(k);
                        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", "");
                        
                }
@@ -219,7 +224,14 @@ public class JsRender.NodeToJs : Object {
                
                //------- at this point it is the end of the code relating directly to the object..
                
-               
+               if (this.out_props.has_key("xns")) {
+                       var v = this.out_props.get("xns");
+                       this.node.setLine(this.cur_line, "p","xns"); 
+                       this.addLine(this.pad + "xns" + " : " + v + suffix, ',');
+                       this.node.setLine(this.cur_line, "p","| xns"); 
+                       this.addLine(this.pad + "'|xns' : '" + v + "'", ',');
+                       this.node.setLine(this.cur_line, "e", "");
+               }
                
                this.node.line_end = this.cur_line;