Make addSingleScaffold private to the loop that uses it.

[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 3762600..166c853 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -2,6 +2,12 @@ mkws.registerWidgetType('Termlists', function() {
     var that = this;
     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;
@@ -14,45 +20,70 @@ mkws.registerWidgetType('Termlists', function() {
        // display if we first got results
        $(that.node).show();
 
+       var output = {};
        var acc = [];
        acc.push('<div class="title">' + M('Termlists') + '</div>');
 
        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 = facetConfig[name];
+           if (!ref) {
+               alert("bad facet configuration: '" + name + "'");
+           } else {
+               addSingleScaffold(acc, ref[0]);
+               function addSingleScaffold(acc, caption) {
+                   var teamName = that.team.name();
+                   acc.push('<div class="mkwsFacet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
+                   acc.push('</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 {
-               alert("bad facet configuration: '" + facets[i] + "'");
+               output[name] = makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
            }
        }
 
        $(that.node).html(acc.join(''));
 
-       function addSingleFacet(acc, caption, data, max, pzIndex) {
+       for (var i = 0; i < facets.length; i++) {
+           var name = facets[i]
+           var ref = facetConfig[name];
+           var caption = ref[0];
+
+           that.log("setting HTML for facet '" + name + "'");
+           that.team.findnode('.mkwsFacet' + caption).html(output[name]);
+       }
+
+
+       function makeSingleFacet(caption, data, max, pzIndex) {
            var teamName = that.team.name();
-           acc.push('<div class="mkwsFacet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
-           acc.push('<div class="termtitle">' + M(caption) + '</div>');
+
+           var a2 = [];
+           a2.push('<div class="termtitle">' + M(caption) + '</div>');
            for (var i = 0; i < data.length && i < max; i++) {
-               acc.push('<div class="term">');
-               acc.push('<a href="#" ');
+               a2.push('<div class="term">');
+               a2.push('<a href="#" ');
                var action = '';
                if (!pzIndex) {
                    // Special case: target selection
-                   acc.push('target_id='+data[i].id+' ');
+                   a2.push('target_id='+data[i].id+' ');
                    if (!that.team.targetFiltered(data[i].id)) {
                        action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
                    }
                } else {
                    action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
                }
-               acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
+               a2.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
                         + ' <span>' + data[i].freq + '</span>');
-               acc.push('</div>');
+               a2.push('</div>');
            }
-           acc.push('</div>');
+           return a2.join('');
        }
     });