From d863773ff286086238b1814801e8f4f7dae44489 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 19 Sep 2013 15:28:17 +0300
Subject: web client: eliminate level parameter from several widget methods

---
 web/client.js | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'web')

diff --git a/web/client.js b/web/client.js
index f282cfa..c2dc508 100644
--- a/web/client.js
+++ b/web/client.js
@@ -372,6 +372,7 @@ $(function() {
 
 	    var Widget = {
 		init: function(data, name, meta, level, editable, removable) {
+		    this.level = level;
 
 		    var value = data.get(name);
 
@@ -553,9 +554,14 @@ $(function() {
 		data, name, meta, level, editable, removable
 	    ) {
 		var el = _.bind(Widget.init, this)(
-		    data, name, meta, level, editable, removable
+		    data,
+		    name,
+		    meta,
+		    Math.min(6, level + 1),
+		    editable,
+		    removable
 		);
-		this.requestData(data.get(name), Math.min(6, level + 1));
+		this.requestData(data.get(name));
 		return el;
 	    }
 
@@ -565,15 +571,17 @@ $(function() {
 
 	    Inline.setStatus = function(status) {};
 
-	    Inline.requestData = function(path, level) {
+	    Inline.requestData = function(path) {
 		var self = this;
 		return txnMgr.query(path).done(function(data) {
-		    self.renderObject(data, level);
+		    self.renderObject(data);
 		});
 	    };
 
-	    Inline.renderObject = function(data, level) {
-		this.el.html($("<h" + level + ">").text(data.meta["ui-name"]));
+	    Inline.renderObject = function(data) {
+		this.el.html(
+		    $("<h" + this.level + ">").text(data.meta["ui-name"])
+		);
 
 		if (!isTreeNode(data.meta))
 		    return this.el.append(JSON.stringify(data));
@@ -598,7 +606,7 @@ $(function() {
 			    data,
 			    name,
 			    meta,
-			    level,
+			    this.level,
 			    editable,
 			    removable
 			)
@@ -700,7 +708,7 @@ $(function() {
 	    Reference.init = function(
 		data, name, meta, level, editable, removable
 	    ) {
-		this.field = ComboBox.render(data.get(name), meta, level);
+		this.field = ComboBox.render(data.get(name), meta);
 		return _.bind(ComboBox.init, this)(
 		    data, name, meta, level, editable, removable
 		);
@@ -714,7 +722,7 @@ $(function() {
 		ComboBox.setElStatus(el.find("select"), status);
 	    };
 
-	    Reference.render = function(value, meta, level) {
+	    Reference.render = function(value, meta) {
 		var el = $("<div>").html(this.field);
 		el.append(" ");
 
@@ -764,8 +772,8 @@ $(function() {
 			return $("#content");
 		    };
 		    form.wrap = function() { return this.el; };
-		    form.requestData = function(path, level) {
-			this.renderObject(data, level);
+		    form.requestData = function(path) {
+			this.renderObject(data);
 		    };
 
 		    var name = split(path).pop();
-- 
cgit v1.2.3