Copy mkws_config into mkws.config, and thereafter use that

[mkws-moved-to-github.git] / src / mkws-widgets.js

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 2154f5a..34b66c0 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -13,14 +13,14 @@ function widget($, team, type, node) {
 
     that.toString = function() {
        return '[Widget ' + team.name() + ':' + type + ']';
-    }
+    };
 
     var fn = mkws.promotionFunction(type);
     if (fn) {
        fn.call(that);
        log("made " + type + " widget(node=" + node + ")");
     } else {
-       log("made UNENCAPSULATED widget(type=" + type + ", node=" + node + ")");
+       log("made UNPROMOTED widget(type=" + type + ", node=" + node + ")");
     }
 
     return that;
@@ -28,10 +28,11 @@ function widget($, team, type, node) {
 
 
 // Functions follow for promoting the regular widget object into
-// widgets of specific types. These could be moved outside of the
-// widget object, or even into their own source files.
+// widgets of specific types. These could be moved into their own
+// source files.
+
 
-function promoteToTargets() {
+mkws.registerWidgetType('Targets', function() {
     var that = this;
     var M = mkws.M;
 
@@ -56,10 +57,10 @@ function promoteToTargets() {
        var subnode = $(that.node).children('.mkwsBytarget');
        subnode.html(table);
     });
-}
+});
 
 
-function promoteToStat() {
+mkws.registerWidgetType('Stat', function() {
     var that = this;
     var M = mkws.M;
 
@@ -72,10 +73,10 @@ function promoteToStat() {
            ' -- ' +
            '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
     });
-}
+});
 
 
-function promoteToTermlists() {
+mkws.registerWidgetType('Termlists', function() {
     var that = this;
     var M = mkws.M;
 
@@ -86,7 +87,7 @@ function promoteToTermlists() {
        }
 
        // no facets: this should never happen
-       if (!mkws_config.facets || mkws_config.facets.length == 0) {
+       if (!mkws.config.facets || mkws.config.facets.length == 0) {
            alert("onTerm called even though we have no facets: " + $.toJSON(data));
            $(that.node).hide();
            return;
@@ -97,7 +98,7 @@ function promoteToTermlists() {
 
        var acc = [];
        acc.push('<div class="title">' + M('Termlists') + '</div>');
-       var facets = mkws_config.facets;
+       var facets = mkws.config.facets;
 
        for (var i = 0; i < facets.length; i++) {
            if (facets[i] == "xtargets") {
@@ -137,10 +138,10 @@ function promoteToTermlists() {
            acc.push('</div>');
        }
     });
-}
+});
 
 
-function promoteToPager() {
+mkws.registerWidgetType('Pager', function() {
     var that = this;
     var M = mkws.M;
 
@@ -201,10 +202,10 @@ function promoteToPager() {
            return s;
        }
     });
-}                           
+});
 
 
-function promoteToRecords() {
+mkws.registerWidgetType('Records', function() {
     var that = this;
     var team = this.team;
 
@@ -232,10 +233,10 @@ function promoteToRecords() {
            return template(hit);
        }
     });
-}
+});
 
 
-function promoteToNavi() {
+mkws.registerWidgetType('Navi', function() {
     var that = this;
     var teamName = this.team.name();
     var M = mkws.M;
@@ -261,42 +262,35 @@ function promoteToNavi() {
 
        $(that.node).html(text);
     });
-}
+});
+
 
+// It seems this and the Perpage widget doen't need to subscribe to
+// anything, since they produce events rather than consuming them.
+//
+mkws.registerWidgetType('Sort', function() {
+    var that = this;
 
-function promoteToSort() {
-    // It seems this and the Perpage widget doen't need to
-    // subscribe to anything, since they produce events rather
-    // than consuming them.
-    $(this.node).change(function () {
-       this.team.set_sortOrder($(node).val());
-       if (this.team.submitted()) {
-           this.team.resetPage();
-           this.team.reShow();
+    $(this.node).change(function() {
+       that.team.set_sortOrder($(that.node).val());
+       if (that.team.submitted()) {
+           that.team.resetPage();
+           that.team.reShow();
        }
        return false;
     });
-}
+});
 
 
-function promoteToPerpage() {
+mkws.registerWidgetType('Perpage', function() {
+    var that = this;
+
     $(this.node).change(function() {
-       this.team.set_perpage($(node).val());
-       if (this.team.submitted()) {
-           this.team.resetPage();
-           this.team.reShow();
+       that.team.set_perpage($(that.node).val());
+       if (that.team.submitted()) {
+           that.team.resetPage();
+           that.team.reShow();
        }
        return false;
     });
-}
-
-mkws.registerWidgetType('Targets', promoteToTargets);
-mkws.registerWidgetType('Stat', promoteToStat);
-mkws.registerWidgetType('Termlists', promoteToTermlists);
-mkws.registerWidgetType('Pager', promoteToPager);
-mkws.registerWidgetType('Records', promoteToRecords);
-mkws.registerWidgetType('Navi', promoteToNavi);
-mkws.registerWidgetType('Sort', promoteToSort);
-mkws.registerWidgetType('Perpage', promoteToPerpage);
-
-
+});