Merge remote branch 'origin/master' into wosch

diff --git a/src/mkws-team.js b/src/mkws-team.js
index e1e985b..a5a2d03 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -427,6 +427,15 @@ function team($, teamName) {
   </tr>\
 </table>');
 
+       var acc = [];
+       var facets = m_config.facets;
+       acc.push('<div class="title">' + M('Termlists') + '</div>');
+       for (var i = 0; i < facets.length; i++) {
+           acc.push('<div class="mkwsFacet mkwsTeam_' + m_teamName + '" data-mkws-facet="' + facets[i] + '">');
+           acc.push('</div>');
+       }
+       findnode(".mkwsTermlists").html(acc.join(''));
+
        var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
        if (m_config.show_sort) {
            ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index b140198..36cfc1d 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,71 +1,54 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
     var facets = that.config.facets;
-    var M = mkws.M;
-
-    mkws.facetConfig = {
-       xtargets: [ "Sources",  16, false ],
-       subject:  [ "Subjects", 10, true ],
-       author:   [ "Authors",  10, true ]
-    }
-
-    var acc = [];
-    acc.push('<div class="title">' + M('Termlists') + '</div>');
-    for (var i = 0; i < facets.length; i++) {
-       var name = facets[i]
-       var ref = mkws.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) {
        // display if we first got results
        $(that.node).show();
+    });
 
-       for (var i = 0; i < facets.length; i++) {
-           var name = facets[i]
-           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);
-           }
-       }
+    widget.autosearch(that);
+});
 
 
-       function makeSingleFacet(caption, data, max, pzIndex) {
-           var teamName = that.team.name();
+mkws.registerWidgetType('Facet', function() {
+    var facetConfig = {
+       xtargets: [ "Sources",  16, false ],
+       subject:  [ "Subjects", 10, true ],
+       author:   [ "Authors",  10, true ]
+    }
 
-           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">');
-               acc.push('<a href="#" ');
-               var action = '';
-               if (!pzIndex) {
-                   // Special case: target selection
-                   acc.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)';
+    var that = this;
+    var teamName = that.team.name();
+    var name = that.config.facet;
+    var ref = facetConfig[name] || alert("no facet definition for '" + name + "'");
+    var caption = ref[0];
+    var max = ref[1];
+    var pzIndex = ref[2] ? name : null;
+
+    that.team.queue("termlists").subscribe(function(data) {
+       data = data[name];
+
+       var acc = [];
+       acc.push('<div class="termtitle">' + mkws.M(caption) + '</div>');
+       for (var i = 0; i < data.length && i < max; i++) {
+           acc.push('<div class="term">');
+           acc.push('<a href="#" ');
+           var action = '';
+           if (!pzIndex) {
+               // Special case: target selection
+               acc.push('target_id='+data[i].id+' ');
+               if (!that.team.targetFiltered(data[i].id)) {
+                   action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
                }
-               acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-                        + ' <span>' + data[i].freq + '</span>');
-               acc.push('</div>');
+           } else {
+               action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
            }
-           return acc.join('');
+           acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
+                    + ' <span>' + data[i].freq + '</span>');
+           acc.push('</div>');
        }
-    });
 
-    widget.autosearch(that);
+       $(that.node).html(acc.join(''));
+    });
 });