web client: eliminate the super method from widgets

3 files changed, 6 insertions, 19 deletions

diff --git a/web/widget/abstract/base.js b/web/widget/abstract/base.js
index 4a49e0b..dd74cca 100644
--- a/web/widget/abstract/base.js
+++ b/web/widget/abstract/base.js
@@ -8,17 +8,9 @@ define(["acf2/dom", "jquery", "underscore"], function(dom, $, _) {
 	extend: function(spec) {
 	    var res = Object.create(this);
 	    for (key in spec) res[key] = spec[key];
-	    res.base = this;
 	    return res;
 	},
 
-	super: function() {
-	    var args = _.toArray(arguments);
-	    var cls = args.shift();
-	    var key = args.shift();
-	    return cls.base[key].apply(this, args);
-	},
-
 	new: function(data, name, meta, level, editable, removable) {
 	    return Object.create(this).init(
 		data, name, meta, level, editable, removable
diff --git a/web/widget/abstract/fields.js b/web/widget/abstract/fields.js
index 73111ce..01e4c0c 100644
--- a/web/widget/abstract/fields.js
+++ b/web/widget/abstract/fields.js
@@ -16,9 +16,9 @@ define(
 	"acf2/widget/reference"
     ],
     function(Base, $, _) {
-	var Class = Base.extend({
+	return Base.extend({
 	    render: function(data, meta) {
-		this.super(Class, "render", data, meta);
+		Base.render.call(this, data, meta);
 
 		this.appendAboveFields(data, meta);
 
@@ -100,7 +100,5 @@ define(
 		return require("acf2/widget/" + meta.widget);
 	    }
 	});
-
-	return Class;
     }
 );
diff --git a/web/widget/abstract/inline.js b/web/widget/abstract/inline.js
index af7d110..6e159b6 100644
--- a/web/widget/abstract/inline.js
+++ b/web/widget/abstract/inline.js
@@ -6,14 +6,13 @@
 define(
     ["acf2/statusbar", "acf2/widget/link", "jquery", "underscore"],
     function(statusBar, Base, $, _) {
-	var Class = Base.extend({
+	return Base.extend({
 	    init: function(
 		data, name, meta, level, editable, removable
 	    ) {
 		this.txnMgr = data.txnMgr;
-		return this.super(
-		    Class,
-		    "init",
+		return Base.init.call(
+		    this,
 		    data,
 		    name,
 		    meta,
@@ -54,7 +53,7 @@ define(
 	    wrap: function() { return this.el; },
 
 	    validate: function(data) {
-		this.super(Class, "validate", data);
+		Base.validate.call(this, data);
 
 		if (this.data.match(this.meta.condition)) {
 		    var valid = data.validate();
@@ -68,7 +67,5 @@ define(
 		    });
 	    }
 	});
-
-	return Class;
     }
 );