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 cfb603a..5986a57 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -20,23 +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 {
+               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 {
-               addSingleScaffold(acc, ref[0]);
                output[name] = makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
            }
        }
 
-       $(that.node).html(acc.join(''));
-
        for (var i = 0; i < facets.length; i++) {
            var name = facets[i]
            var ref = facetConfig[name];
@@ -46,12 +55,6 @@ mkws.registerWidgetType('Termlists', function() {
            that.team.findnode('.mkwsFacet' + caption).html(output[name]);
        }
 
-       function addSingleScaffold(acc, caption) {
-           var teamName = that.team.name();
-           acc.push('<div class="mkwsFacet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
-           acc.push('</div>');
-       }
-
 
        function makeSingleFacet(caption, data, max, pzIndex) {
            var teamName = that.team.name();