X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e9624f6c82f155a980c0bdb108930a308272e794;hb=98427bcb4e1139816d533950820071ddd52c9c35;hp=52f8e732d8ad5362ea9d6941f9d2daefa12aa008;hpb=c539df1fd08f6cffc82593ba253e7eba99c7b9cd;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 52f8e73..e9624f6 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -67,7 +67,7 @@ Handlebars.registerHelper('commaList', function(items, options) {
 
 
 // Some functions are visible to be called from outside code, namely
-// generated HTML: mkws.switchView(), showDetails(), limitTarget(),
+// generated HTML: that.switchView(), showDetails(), limitTarget(),
 // limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(),
 // pagerNext(), showPage(). Also mkws.M() is made available for the
 // Handlebars helper 'translate'
@@ -292,7 +292,7 @@ function team($, teamName) {
     {
 	var template = loadTemplate("Summary");
 	hit._id = "mkwsRec_" + hit.recid;
-	hit._onclick = "mkws.showDetails(this.id, '" + m_teamName + "');return false;"
+	hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
 	return template(hit);
     }
 
@@ -358,7 +358,7 @@ function team($, teamName) {
 		acc.push('target_id='+data[i].id+' ');
 		action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
 	    } else {
-		action = 'mkws.limitQuery(\'' + pzIndex + '\', this.firstChild.nodeValue)';
+		action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
 	    }
 	    acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
 		     + ' <span>' + data[i].freq + '</span>');
@@ -542,11 +542,11 @@ function team($, teamName) {
     }
 
 
-    // limit the query after clicking the facet
-    mkws.limitQuery = function (field, value)
+    // limit by target functions
+    that.limitTarget  = function (id, name)
     {
-	debug("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filters.push({ field: field, value: value });
+	debug("limitTarget(id=" + id + ", name=" + name + ")");
+	m_filters.push({ id: id, name: name });
 	redraw_navi();
 	resetPage();
 	loadSelect();
@@ -555,11 +555,11 @@ function team($, teamName) {
     }
 
 
-    // limit by target functions
-    that.limitTarget  = function (id, name)
+    // limit the query after clicking the facet
+    that.limitQuery = function (field, value)
     {
-	debug("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filters.push({ id: id, name: name });
+	debug("limitQuery(field=" + field + ", value=" + value + ")");
+	m_filters.push({ field: field, value: value });
 	redraw_navi();
 	resetPage();
 	loadSelect();
@@ -568,15 +568,13 @@ function team($, teamName) {
     }
 
 
-    mkws.delimitQuery = function (field, value)
+    that.delimitTarget = function (id)
     {
-	debug("delimitQuery(field=" + field + ", value=" + value + ")");
+	debug("delimitTarget(id=" + id + ")");
 	var newFilters = [];
 	for (var i in m_filters) {
 	    var filter = m_filters[i];
-	    if (filter.field &&
-		field == filter.field &&
-		value == filter.value) {
+	    if (filter.id) {
 		debug("delimitTarget() removing filter " + $.toJSON(filter));
 	    } else {
 		debug("delimitTarget() keeping filter " + $.toJSON(filter));
@@ -593,16 +591,18 @@ function team($, teamName) {
     }
 
 
-    mkws.delimitTarget = function (id)
+    that.delimitQuery = function (field, value)
     {
-	debug("delimitTarget(id=" + id + ")");
+	debug("delimitQuery(field=" + field + ", value=" + value + ")");
 	var newFilters = [];
 	for (var i in m_filters) {
 	    var filter = m_filters[i];
-	    if (filter.id) {
-		debug("delimitTarget() removing filter " + $.toJSON(filter));
+	    if (filter.field &&
+		field == filter.field &&
+		value == filter.value) {
+		debug("delimitQuery() removing filter " + $.toJSON(filter));
 	    } else {
-		debug("delimitTarget() keeping filter " + $.toJSON(filter));
+		debug("delimitQuery() keeping filter " + $.toJSON(filter));
 		newFilters.push(filter);
 	    }
 	}
@@ -628,11 +628,11 @@ function team($, teamName) {
 	    }
 	    var filter = m_filters[i];
 	    if (filter.id) {
-		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(' +
-		    "'" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
+		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
 	    } else {
-		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(' +
-		    "'" + filter.field + "', '" + filter.value + "'" +
+		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
+		    "', '" + filter.field + "', '" + filter.value + "'" +
 		    ');return false;">' + filter.value + '</a>';
 	    }
 	}
@@ -1381,7 +1381,7 @@ function _mkws_jquery_plugin ($) {
     };
 
 
-    mkws.showDetails = function (prefixRecId, tname) {
+    mkws.showDetails = function (tname, prefixRecId) {
 	mkws.teams[tname].showDetails(prefixRecId);
     }
 
@@ -1389,6 +1389,17 @@ function _mkws_jquery_plugin ($) {
 	mkws.teams[tname].limitTarget(id, name);
     }
 
+    mkws.limitQuery  = function (tname, field, value) {
+	mkws.teams[tname].limitQuery(field, value);
+    }
+
+    mkws.delimitTarget = function (tname, id) {
+	mkws.teams[tname].delimitTarget(id);
+    }
+
+    mkws.delimitQuery = function (tname, field, value) {
+	mkws.teams[tname].delimitQuery(field, value);
+    }
 
     function default_mkws_config() {
 	/* default mkws config */