X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-termlists.js;h=3df2f60bb45c4f869435525c03e93d4601248541;hb=0d381791dd8bd101ded339e2f832afb3d0ef6260;hp=1f13820e4177293d8d551d6ce920390ae197058a;hpb=ed4b067f8083566fa9de056fd7629278228bb2a5;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index 1f13820..3df2f60 100644
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -41,28 +41,31 @@ mkws.registerWidgetType('Facet', function() {
 
   that.team.queue("termlists").subscribe(function(data) {
     data = data[name];
-
-    var teamName = that.team.name();
-    var acc = [];
     var template = that.team.loadTemplate('facetTitle-' + caption, mkws.M(caption))
     var title = template({ query: that.config.query });
-    acc.push('<div class="mkwsFacetTitle">' + title + '</div>');
+    var acc = [];
+    acc.push('<div class="mkwsFacetTitle">', title, '</div>');
+
+    var teamName = that.team.name();
     for (var i = 0; i < data.length && i < max; i++) {
-      acc.push('<div class="mkwsTerm">');
-      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 fn, field;
+      // General case modifies the query; special case selects a target
+      if (pzIndex) {
+        fn = 'limitQuery'; field = pzIndex;
+      } else if (!that.team.targetFiltered(data[i].id)) {
+        fn = 'limitTarget'; field = data[i].id;
       }
-      acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-               + ' <span>' + data[i].freq + '</span>');
-      acc.push('</div>');
+
+      var template = that.team.loadTemplate('Facet');
+      var s = template({ 
+        team: teamName,
+        fn: fn,
+        field: field,
+        term: data[i].name,
+        count: data[i].freq,
+        query: that.config.query
+      });
+      acc.push('<div class="mkwsTerm">', s, '</div>');
     }
 
     that.node.html(acc.join(''));