X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-termlists.js;h=33d12b92255e538a33188256a7d8a93ca629ceda;hb=b75f69516de319ca5c283a70238a482e86303138;hp=eb299f00e181ef171a39a01e5fa265ced41e4cb8;hpb=7e9bf49237333c81ce6946ee735ba454dd0198b3;p=mkws-moved-to-github.git

diff --git a/src/mkws-widget-termlists.js b/src/mkws-widget-termlists.js
index eb299f0..33d12b9 100644
--- a/src/mkws-widget-termlists.js
+++ b/src/mkws-widget-termlists.js
@@ -1,77 +1,64 @@
 mkws.registerWidgetType('Termlists', function() {
     var that = this;
-    var M = mkws.M;
-
-    var facetConfig = {
-	xtargets: [ "Sources",  16, false ],
-	subject:  [ "Subjects", 10, true ],
-	author:   [ "Author",   10, true ]
-    }
 
+    // Initially hide the termlists; display when we get results
+    $(document).ready(function() {
+        $(that.node).hide();
+    });
     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 output = {};
-	var acc = [];
-	acc.push('<div class="title">' + M('Termlists') + '</div>');
+    var acc = [];
+    var facets = this.config.facets;
+    acc.push('<div class="title">' + mkws.M('Termlists') + '</div>');
+    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(''));
 
-	for (var i = 0; i < facets.length; i++) {
-	    var name = facets[i]
-	    var ref = facetConfig[name];
-	    if (!ref) {
-		alert("bad facet configuration: '" + name + "'");
-	    } else {
-		output[name] = addSingleFacet(acc, ref[0], data[name], ref[1], ref[2] ? name : null);
-	    }
-	}
+    widget.autosearch(this);
+});
 
-	$(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];
+mkws.registerWidgetType('Facet', function() {
+    var facetConfig = {
+	xtargets: [ "Sources",  16, false ],
+	subject:  [ "Subjects", 10, true ],
+	author:   [ "Authors",  10, true ]
+    }
 
-	    that.log("setting HTML for facet '" + name + "'");
-	    that.team.findnode('.mkwsFacet' + caption).html(output[name]);
-	}
+    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;
 
-	function addSingleFacet(acc, caption, data, max, pzIndex) {
-	    var teamName = that.team.name();
-	    acc.push('<div class="mkwsFacet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
+    that.team.queue("termlists").subscribe(function(data) {
+	data = data[name];
 
-	    var a2 = [];
-	    a2.push('<div class="termtitle">' + M(caption) + '</div>');
-	    for (var i = 0; i < data.length && i < max; i++) {
-		a2.push('<div class="term">');
-		a2.push('<a href="#" ');
-		var action = '';
-		if (!pzIndex) {
-		    // Special case: target selection
-		    a2.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 teamName = that.team.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)';
 		}
-		a2.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-			 + ' <span>' + data[i].freq + '</span>');
-		a2.push('</div>');
+	    } 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 a2.join('');
 	}
-    });
 
-    widget.autosearch(that);
+	$(that.node).html(acc.join(''));
+    });
 });