From: Alan Knowles <alan@roojs.com>
Date: Fri, 15 May 2015 03:21:58 +0000 (+0800)
Subject: src/JsRender/Roo.vala
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=6499584c03f87eb2f1e4fc65ede37697dce47919;p=app.Builder.js

src/JsRender/Roo.vala
---

diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala
index 0ea036d86..759abeb4c 100644
--- a/src/JsRender/Roo.vala
+++ b/src/JsRender/Roo.vala
@@ -98,46 +98,46 @@ namespace JsRender {
         public  override void  loadItems() throws GLib.Error // : function(cb, sync) == original was async.
         {
             
-             
-		print("load Items!");
-		if (this.tree != null) {
-			return;
-		}
-		print("load " + this.path);
-
-		var pa = new Json.Parser();
-		pa.load_from_file(this.path);
-		var node = pa.get_root();
+				 
+			print("load Items!");
+			if (this.tree != null) {
+				return;
+			}
+			print("load " + this.path);
 
-		if (node.get_node_type () != Json.NodeType.OBJECT) {
-			throw new Error.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
-		}
-		var obj = node.get_object ();
-	
-	
-		this.modOrder = this.jsonHasOrEmpty(obj, "modOrder");
-		this.name = this.jsonHasOrEmpty(obj, "name");
-		this.parent = this.jsonHasOrEmpty(obj, "parent");
-		this.permname = this.jsonHasOrEmpty(obj, "permname");
-		this.title = this.jsonHasOrEmpty(obj, "title");
-		this.modOrder = this.jsonHasOrEmpty(obj, "modOrder");
-
-		var bjs_version_str = this.jsonHasOrEmpty(obj, "bjs-version");
-		bjs_version_str = bjs_version_str == "" ? "1" : bjs_version_str;
+			var pa = new Json.Parser();
+			pa.load_from_file(this.path);
+			var node = pa.get_root();
 
+			if (node.get_node_type () != Json.NodeType.OBJECT) {
+				throw new Error.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
+			}
+			var obj = node.get_object ();
 		
-		// load items[0] ??? into tree...
-		if (obj.has_member("items") 
-			&& 
-			obj.get_member("items").get_node_type() == Json.NodeType.ARRAY
-			&&
-			obj.get_array_member("items").get_length() > 0
-		) {
-			this.tree = new Node(); 
-			var ar = obj.get_array_member("items");
-			var tree_base = ar.get_object_element(0);
-			this.tree.loadFromJson(tree_base, int.parse(bjs_version_str));
-		}
+		
+			this.modOrder = this.jsonHasOrEmpty(obj, "modOrder");
+			this.name = this.jsonHasOrEmpty(obj, "name");
+			this.parent = this.jsonHasOrEmpty(obj, "parent");
+			this.permname = this.jsonHasOrEmpty(obj, "permname");
+			this.title = this.jsonHasOrEmpty(obj, "title");
+			this.modOrder = this.jsonHasOrEmpty(obj, "modOrder");
+
+			var bjs_version_str = this.jsonHasOrEmpty(obj, "bjs-version");
+			bjs_version_str = bjs_version_str == "" ? "1" : bjs_version_str;
+
+			
+			// load items[0] ??? into tree...
+			if (obj.has_member("items") 
+				&& 
+				obj.get_member("items").get_node_type() == Json.NodeType.ARRAY
+				&&
+				obj.get_array_member("items").get_length() > 0
+			) {
+				this.tree = new Node(); 
+				var ar = obj.get_array_member("items");
+				var tree_base = ar.get_object_element(0);
+				this.tree.loadFromJson(tree_base, int.parse(bjs_version_str));
+			}