web client: pass meta argument correctly to render method of top-level widget

1 files changed, 13 insertions, 15 deletions

diff --git a/web/client.js b/web/client.js
index 1e8eb91..77fef5d 100644
--- a/web/client.js
+++ b/web/client.js
@@ -806,9 +806,9 @@ $(function() {
 		    this.reqData = data;
 		    var self = this;
 		    
-		    if (data.meta.type == "model") {
+		    if (meta.type == "model") {
 			this.fields = {};
-			_.each(data.meta.fields, function(field) {
+			_.each(meta.fields, function(field) {
 			    self.fields[field.name] = self.renderField(
 				field.name,
 				field,
@@ -834,9 +834,9 @@ $(function() {
 		    }
 		    
 		    else _.each(data.data, function(value, name) {
-			if (data.meta.type == "set") name = data.data[name];
+			if (meta.type == "set") name = data.data[name];
 			else if (_.isArray(data.data)) name++;
-			self.renderCollectionMember(name, data.meta);
+			self.renderCollectionMember(name, meta);
 		    });		
 		},
 
@@ -950,7 +950,7 @@ $(function() {
 
 		render: function(data, meta) {
 		    this.el.html(
-			$("<h" + this.level + ">").text(data.meta["ui-name"])
+			$("<h" + this.level + ">").text(meta["ui-name"])
 		    );
 		}
 	    });
@@ -962,7 +962,7 @@ $(function() {
 		render: function(data, meta) {
 		    this.super(Vertical, "render", data, meta);
 		    
-		    if (!isTreeNode(data.meta))
+		    if (!isTreeNode(meta))
 			return this.el.append(JSON.stringify(data));
 		    
 		    this.div = $("<div>");
@@ -970,8 +970,8 @@ $(function() {
 
 		    var self = this;
 		    
-		    if (data.meta.type == "model")
-			_.each(data.meta.actions, function(action) {
+		    if (meta.type == "model")
+			_.each(meta.actions, function(action) {
 			    self.div.append($("<input>").attr(
 				{type: "submit", value: action["ui-name"]}
 			    ).click(function() {
@@ -985,7 +985,7 @@ $(function() {
 		    
 		    this.renderFields(data, meta);
 		    
-		    if (_.contains(["collection", "list"], data.meta.type)) {
+		    if (_.contains(["collection", "list"], meta.type)) {
 			var keys = _.clone(_.keys(data.data));
 			
 			var button = $("<input>").attr(
@@ -1005,11 +1005,9 @@ $(function() {
 				
 				data.set(
 				    name,
-				    isTreeNode(data.meta.members) ? {} : null
+				    isTreeNode(meta.members) ? {} : null
 				).done(function(txnValid) {
-				    self.renderCollectionMember(
-					name, data.meta
-				    );
+				    self.renderCollectionMember(name, meta);
 				    button.prop("class", null);
 				    statusBar.validationReady(txnValid);
 				});
@@ -1017,7 +1015,7 @@ $(function() {
 
 			    button.prop("class", "hidden");
 			    
-			    if (data.meta.type == "collection") {
+			    if (meta.type == "collection") {
 				var field = $("<input>").attr({type: "text"});
 				var row = $("<tr>").html($("<td>").html(field));
 				getter = function() {
@@ -1232,7 +1230,7 @@ $(function() {
 			createEl: function() { return $("#content").empty(); },
 			wrap: function() { return this.el; },
 			requestData: function(value, meta) {
-			    return $.Deferred().resolve(data, meta);
+			    return $.Deferred().resolve(data, data.meta);
 			}
 		    }).new(
 			{