From ac988830d3bf3fcd5a1c5471d617506da0b573be Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Fri, 7 Feb 2014 19:49:39 +0200
Subject: web client: split Inline class into two

do not inherit field rendering logic to Checkboxes
---
 web/client.js | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

(limited to 'web')

diff --git a/web/client.js b/web/client.js
index 102e0eb..8d67d7a 100644
--- a/web/client.js
+++ b/web/client.js
@@ -872,6 +872,31 @@ $(function() {
 			this.el.html(
 			    $("<h" + this.level + ">").text(meta["ui-name"])
 			);
+		},
+
+		wrap: function() { return this.el; },
+
+		validate: function(data) {
+		    this.super(Inline, "validate", data);
+		    
+		    if (this.data.match(this.meta.condition)) {
+			var valid = data.validate();
+			this.setStatus(data.status());
+			statusBar.validationReady(valid);
+		    }
+			
+		    if (this.fields)
+			_.each(this.fields, function(field) {
+			    field.trigger("updated");
+			});
+		}
+	    });
+
+
+	    var InlineFields = Inline.extend({
+
+		render: function(data, meta) {
+		    this.super(InlineFields, "render", data, meta);
 
 		    this.appendAboveFields(data, meta);
 
@@ -949,28 +974,11 @@ $(function() {
 		    ).trigger("start");
 		},
 		
-		widget: function(meta) { return widgets[meta.widget]; },
-		
-		wrap: function() { return this.el; },
-
-		validate: function(data) {
-		    this.super(Inline, "validate", data);
-		    
-		    if (this.data.match(this.meta.condition)) {
-			var valid = data.validate();
-			this.setStatus(data.status());
-			statusBar.validationReady(valid);
-		    }
-			
-		    if (this.fields)
-			_.each(this.fields, function(field) {
-			    field.trigger("updated");
-			});
-		}
+		widget: function(meta) { return widgets[meta.widget]; }		
 	    });
 
 
-	    var Horizontal = Inline.extend({
+	    var Horizontal = InlineFields.extend({
 		createEl: function() {
 		    this.previous = null;
 		    return $("<tr>").html($("<td>").prop(
@@ -1026,7 +1034,7 @@ $(function() {
 	    });
 
 
-	    var Vertical = Inline.extend({
+	    var Vertical = InlineFields.extend({
 		wrap: function() { return $("<div>").html(this.el); },
 		
 		appendAboveFields: function(data, meta) {
-- 
cgit v1.2.3