Tweak

[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..e29ede0 100644 (file)
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,79 +1,54 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
-    var M = mkws.M;
+    var facets = that.config.facets;
 
+    this.team.queue("termlists").subscribe(function(data) {
+       // display if we first got results
+       $(that.node).show();
+    });
+
+    widget.autosearch(that);
+});
+
+
+mkws.registerWidgetType('Facet', function() {
     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 that = this;
+    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 teamName = that.team.name();
        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(''));
-
-
-       for (var i = 0; i < facets.length; i++) {
-           var name = facets[i]
-           var ref = facetConfig[name];
-           var caption = ref[0];
-           if (!ref) {
-               alert("bad facet configuration: '" + name + "'");
+       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)';
+               }
            } else {
-               var output = makeSingleFacet(ref[0], data[name], ref[1], ref[2] ? name : null);
-               that.team.findnode('.mkwsFacet' + caption).html(output);
+               action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
            }
+           acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
+                    + ' <span>' + data[i].freq + '</span>');
+           acc.push('</div>');
        }
 
-
-       function makeSingleFacet(caption, data, max, pzIndex) {
-           var teamName = that.team.name();
-
-           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)';
-               }
-               acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-                        + ' <span>' + data[i].freq + '</span>');
-               acc.push('</div>');
-           }
-           return acc.join('');
-       }
+       $(that.node).html(acc.join(''));
     });
-
-    widget.autosearch(that);
 });