X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-termlists.js;h=715eff2ef2ea89872c258fd506b553e03e2f31ec;hb=139d7f620e0fb02a7cb1136d3d9e7250bf4a30a5;hp=b28261479ea23fbada6fb7cb6410ac84b0c224a4;hpb=f122cb28acf4edfef651bc59472f1a88d03b6035;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index b282614..715eff2 100644
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -2,11 +2,11 @@ mkws.registerWidgetType('Termlists', function() {
   var that = this;
 
   // Initially hide the termlists; display when we get results
-  $(document).ready(function() {
-    $(that.node).hide();
+  mkws.$(document).ready(function() {
+    that.node.hide();
   });
   this.team.queue("termlists").subscribe(function(data) {
-    $(that.node).show();
+    that.node.show();
   });
 
   var acc = [];
@@ -15,9 +15,9 @@ mkws.registerWidgetType('Termlists', function() {
   for (var i = 0; i < facets.length; i++) {
     acc.push('<div class="mkwsFacet mkwsTeam_', this.team.name(), '" data-mkws-facet="', facets[i], '">', '</div>');
   }
-  $(this.node).html(acc.join(''));
+  this.node.html(acc.join(''));
 
-  widget.autosearch(this);
+  this.autosearch();
 });
 
 
@@ -30,9 +30,9 @@ mkws.registerWidgetType('Facet', function() {
 
   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 ref = facetConfig[name] || [ "Unknown", 10, true ];
+  var caption = this.config['facet_caption_' + name] || ref[0];
+  var max     = parseInt(this.config['facet_max_' + name] || ref[1]);
   var pzIndex = ref[2] ? name : null;
 
   that.toString = function() {
@@ -41,28 +41,34 @@ mkws.registerWidgetType('Facet', function() {
 
   that.team.queue("termlists").subscribe(function(data) {
     data = data[name];
+    var template = that.team.loadTemplate('facetTitle-' + caption, mkws.M(caption))
+    var title = template({ query: that.config.query });
+    var acc = [];
+    acc.push('<div class="mkwsFacetTitle">', title, '</div>');
 
     var teamName = that.team.name();
-    var acc = [];
-    acc.push('<div class="mkwsFacetTitle">' + mkws.M(caption) + '</div>');
     for (var i = 0; i < data.length && i < max; i++) {
-      acc.push('<div class="mkwsTerm">');
-      acc.push('<a href="#" ');
+      var fn, datum;
+      // General case modifies the query; special case selects a target
+      if (pzIndex) {
+        fn = 'limitQuery'; datum = pzIndex;
+      } else if (!that.team.targetFiltered(data[i].id)) {
+        fn = 'limitTarget'; datum = data[i].id;
+      }
+
       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)';
+      if (fn) {
+        action = 'mkws.' + fn + '(\'' + teamName + '\', \'' + datum + '\', this.firstChild.nodeValue)';
       }
-      acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-               + ' <span>' + data[i].freq + '</span>');
-      acc.push('</div>');
+
+      acc.push('<div class="mkwsTerm">',
+               '<a href="#" ', 'onclick="', action, ';return false;">', data[i].name, '</a>',
+               '<span>', data[i].freq, '</span>',
+               '</div>');
     }
 
-    $(that.node).html(acc.join(''));
+    that.node.html(acc.join(''));
   });
+
+  this.autosearch();
 });