Reorder code to bring scaffold-generation together.

[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 eb299f0..5986a57 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -5,7 +5,7 @@ mkws.registerWidgetType('Termlists', function() {
     var facetConfig = {
        xtargets: [ "Sources",  16, false ],
        subject:  [ "Subjects", 10, true ],
-       author:   [ "Author",   10, true ]
+       author:   [ "Authors",  10, true ]
     }
 
     this.team.queue("termlists").subscribe(function(data) {
@@ -20,22 +20,32 @@ 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++) {
            var name = facets[i]
            var ref = facetConfig[name];
            if (!ref) {
                alert("bad facet configuration: '" + name + "'");
            } else {
-               output[name] = addSingleFacet(acc, ref[0], data[name], ref[1], ref[2] ? name : null);
+               acc.push('<div class="mkwsFacet mkwsFacet' + ref[0] + ' mkwsTeam_' + that.team.name() + '">');
+               acc.push('</div>');
            }
        }
-
        $(that.node).html(acc.join(''));
 
+
+       var output = {};
+       for (var i = 0; i < facets.length; i++) {
+           var name = facets[i]
+           var ref = facetConfig[name];
+           if (!ref) {
+               alert("bad facet configuration: '" + name + "'");
+           } else {
+               output[name] = makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
+           }
+       }
+
        for (var i = 0; i < facets.length; i++) {
            var name = facets[i]
            var ref = facetConfig[name];
@@ -45,9 +55,9 @@ mkws.registerWidgetType('Termlists', function() {
            that.team.findnode('.mkwsFacet' + caption).html(output[name]);
        }
 
-       function addSingleFacet(acc, caption, data, max, pzIndex) {
+
+       function makeSingleFacet(caption, data, max, pzIndex) {
            var teamName = that.team.name();
-           acc.push('<div class="mkwsFacet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
 
            var a2 = [];
            a2.push('<div class="termtitle">' + M(caption) + '</div>');
@@ -68,7 +78,6 @@ mkws.registerWidgetType('Termlists', function() {
                         + ' <span>' + data[i].freq + '</span>');
                a2.push('</div>');
            }
-           acc.push('</div>');
            return a2.join('');
        }
     });