X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=517850bc3dbcb85cd7dd800540e7b1435206e660;hb=df823384f61228cdcedc53999e44dc4704c858f9;hp=98a48bde67a9f30d60e8afb2f5e193063fb60b3d;hpb=2e98f6b0b8c985dadb49d9658f22df6911b43eee;p=mkws-moved-to-github.git

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 98a48bd..517850b 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -10,7 +10,7 @@ function widget($, team, type, node) {
 	team: team,
 	type: type,
 	node: node,
-	config: Object.create(team.config())
+	config: mkws.objectInheritingFrom(team.config())
     };
 
     function log(s) {
@@ -22,6 +22,10 @@ function widget($, team, type, node) {
 	return '[Widget ' + team.name() + ':' + type + ']';
     };
 
+    that.value = function() {
+        return node.value;
+    }
+
     for (var i = 0; i < node.attributes.length; i++) {
 	var a = node.attributes[i];
 	if (a.name === 'data-mkws-config') {
@@ -154,73 +158,6 @@ mkws.registerWidgetType('Stat', function() {
 });
 
 
-mkws.registerWidgetType('Termlists', function() {
-    var that = this;
-    var M = mkws.M;
-
-    this.team.queue("termlists").subscribe(function(data) {
-	if (!that.node) {
-	    alert("termlists event when there are no termlists");
-	    return;
-	}
-
-	// 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 acc = [];
-	acc.push('<div class="title">' + M('Termlists') + '</div>');
-
-	for (var i = 0; i < facets.length; i++) {
-	    if (facets[i] == "xtargets") {
-		addSingleFacet(acc, "Sources",  data.xtargets, 16, null);
-	    } else if (facets[i] == "subject") {
-		addSingleFacet(acc, "Subjects", data.subject,  10, "subject");
-	    } else if (facets[i] == "author") {
-		addSingleFacet(acc, "Authors",  data.author,   10, "author");
-	    } else {
-		alert("bad facet configuration: '" + facets[i] + "'");
-	    }
-	}
-
-	$(that.node).html(acc.join(''));
-
-	function addSingleFacet(acc, caption, data, max, pzIndex) {
-	    var teamName = that.team.name();
-	    acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + teamName + '">');
-	    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>');
-	    }
-	    acc.push('</div>');
-	}
-    });
-
-    widget.autosearch(that);
-});
-
-
 mkws.registerWidgetType('Pager', function() {
     var that = this;
     var M = mkws.M;
@@ -248,24 +185,24 @@ mkws.registerWidgetType('Pager', function() {
 		? firstClkbl + 2*onsides
 		: pages;
 
-	    var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+	    var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span> | ';
 	    if (currentPage > 1)
 		prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
-		+'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+		+'&#60;&#60; ' + M('Prev') + '</a> | ';
 
 	    var middle = '';
 	    for(var i = firstClkbl; i <= lastClkbl; i++) {
 		var numLabel = i;
 		if(i == currentPage)
-		    numLabel = '<b>' + i + '</b>';
+		    numLabel = '<span class="mkwsSelected">' + i + '</span>';
 
 		middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
 		    + numLabel + ' </a>';
 	    }
 
-	    var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+	    var next = ' | <span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
 	    if (pages - currentPage > 0)
-		next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+		next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
 		+ M('Next') + ' &#62;&#62;</a>';
 
 	    var predots = '';
@@ -285,6 +222,13 @@ mkws.registerWidgetType('Pager', function() {
 });
 
 
+mkws.registerWidgetType('Results', function() {
+    // Nothing to do apart from act as an autosearch trigger
+    // Contained elements do all the real work
+    widget.autosearch(this);
+});
+
+
 mkws.registerWidgetType('Records', function() {
     var that = this;
     var team = this.team;
@@ -293,6 +237,7 @@ mkws.registerWidgetType('Records', function() {
 	var html = [];
 	for (var i = 0; i < data.hits.length; i++) {
 	    var hit = data.hits[i];
+            that.team.queue("record").publish(hit);
 	    var divId = team.recordElementId(hit.recid[0]);
 	    html.push('<div class="record mkwsTeam_' + team.name() + ' ' + divId + '">', renderSummary(hit), '</div>');
 	    // ### At some point, we may be able to move the
@@ -326,20 +271,18 @@ mkws.registerWidgetType('Navi', function() {
 	var filters = that.team.filters();
 	var text = "";
 
-	for (var i in filters) {
-	    if (text) {
-		text += " | ";
-	    }
-	    var filter = filters[i];
-	    if (filter.id) {
-		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
-		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
-	    } else {
-		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
-		    "', '" + filter.field + "', '" + filter.value + "'" +
-		    ');return false;">' + filter.value + '</a>';
-	    }
-	}
+	filters.visitTargets(function(id, name) {
+	    if (text) text += " | ";
+	    text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
+		"', '" + id + "'" + ');return false;">' + name + '</a>';
+	});
+
+	filters.visitFields(function(field, value) {
+	    if (text) text += " | ";
+	    text += M(field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
+		"', '" + field + "', '" + value + "'" +
+		');return false;">' + value + '</a>';
+	});
 
 	$(that.node).html(text);
     });
@@ -355,7 +298,6 @@ mkws.registerWidgetType('Sort', function() {
     $(this.node).change(function() {
 	that.team.set_sortOrder($(that.node).val());
 	if (that.team.submitted()) {
-	    that.team.resetPage();
 	    that.team.reShow();
 	}
 	return false;
@@ -369,9 +311,17 @@ mkws.registerWidgetType('Perpage', function() {
     $(this.node).change(function() {
 	that.team.set_perpage($(that.node).val());
 	if (that.team.submitted()) {
-	    that.team.resetPage();
 	    that.team.reShow();
 	}
 	return false;
     });
 });
+
+
+mkws.registerWidgetType('Done', function() {
+    var that = this;
+
+    this.team.queue("complete").subscribe(function(n) {
+	$(that.node).html("Search complete: found " + n + " records");
+    });
+});