Separate out callback for displaying termlists area and filling individual lists.

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

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index b9e7b11..e61ea64 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,39 +1,30 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
+    var facets = that.config.facets;
     var M = mkws.M;
 
     this.team.queue("termlists").subscribe(function(data) {
-       // no facets: this should never happen
-       var facets = that.config.facets;
-       if (!facets || facets.length == 0) {
-           alert("onTerm called even though we have no facets: " + $.toJSON(data));
-           $(that.node).hide();
-           return;
-       }
-
        // display if we first got results
        $(that.node).show();
+    });
 
-       var acc = [];
-       acc.push('<div class="title">' + M('Termlists') + '</div>');
-
+    this.team.queue("termlists").subscribe(function(data) {
        for (var i = 0; i < facets.length; i++) {
-           if (facets[i] == "xtargets") {
-               addSingleFacet(acc, "Sources",  data.xtargets, 16, null);
-           } else if (facets[i] == "subject") {
-               addSingleFacet(acc, "Subjects", data.subject,  10, "subject");
-           } else if (facets[i] == "author") {
-               addSingleFacet(acc, "Authors",  data.author,   10, "author");
+           var name = facets[i]
+           var ref = mkws.facetConfig[name];
+           var caption = ref[0];
+           if (!ref) {
+               alert("bad facet configuration: '" + name + "'");
            } else {
-               alert("bad facet configuration: '" + facets[i] + "'");
+               makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
            }
        }
 
-       $(that.node).html(acc.join(''));
 
-       function addSingleFacet(acc, caption, data, max, pzIndex) {
+       function makeSingleFacet(caption, data, max, pzIndex) {
            var teamName = that.team.name();
-           acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
+
+           var acc = [];
            acc.push('<div class="termtitle">' + M(caption) + '</div>');
            for (var i = 0; i < data.length && i < max; i++) {
                acc.push('<div class="term">');
@@ -52,7 +43,7 @@ mkws.registerWidgetType('Termlists', function() {
                         + ' <span>' + data[i].freq + '</span>');
                acc.push('</div>');
            }
-           acc.push('</div>');
+           that.team.findnode('.mkwsFacet' + caption).html(acc.join(''));
        }
     });