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 0b6d6c0..e61ea64 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,50 +1,22 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
+    var facets = that.config.facets;
     var M = mkws.M;
 
-    var facetConfig = {
-       xtargets: [ "Sources",  16, false ],
-       subject:  [ "Subjects", 10, true ],
-       author:   [ "Authors",  10, true ]
-    }
-
     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>');
-       for (var i = 0; i < facets.length; i++) {
-           var name = facets[i]
-           var ref = facetConfig[name];
-           if (!ref) {
-               alert("bad facet configuration: '" + name + "'");
-           } else {
-               acc.push('<div class="mkwsFacet mkwsFacet' + ref[0] + ' mkwsTeam_' + that.team.name() + '">');
-               acc.push('</div>');
-           }
-       }
-       $(that.node).html(acc.join(''));
-
-
+    this.team.queue("termlists").subscribe(function(data) {
        for (var i = 0; i < facets.length; i++) {
            var name = facets[i]
-           var ref = facetConfig[name];
+           var ref = mkws.facetConfig[name];
            var caption = ref[0];
            if (!ref) {
                alert("bad facet configuration: '" + name + "'");
            } else {
-               var output = makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
-               that.team.findnode('.mkwsFacet' + caption).html(output);
+               makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
            }
        }
 
@@ -71,7 +43,7 @@ mkws.registerWidgetType('Termlists', function() {
                         + ' <span>' + data[i].freq + '</span>');
                acc.push('</div>');
            }
-           return acc.join('');
+           that.team.findnode('.mkwsFacet' + caption).html(acc.join(''));
        }
     });