summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-02-07 19:49:39 +0200
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-02-12 12:38:30 +0200
commitac988830d3bf3fcd5a1c5471d617506da0b573be (patch)
tree43d1e1abf342dfb312fbb37674841f8757e19ef8 /web
parent703a27ab48d03f9ea3639654b65d4395463c057c (diff)
downloadaconf-ac988830d3bf3fcd5a1c5471d617506da0b573be.tar.bz2
aconf-ac988830d3bf3fcd5a1c5471d617506da0b573be.tar.xz
web client: split Inline class into two
do not inherit field rendering logic to Checkboxes
Diffstat (limited to 'web')
-rw-r--r--web/client.js48
1 files changed, 28 insertions, 20 deletions
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) {