X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=5a2563b1888d3cca27658925676832e52dd96f96;hb=f5ad3c3d45025f21e346a4fa343d0473a9cb4b39;hp=e2890e26adfcf52c8e3a74afb6774770dc1ef171;hpb=2bee41bb1fc715929a49f6f1686e78322bf9b4a6;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index e2890e2..5a2563b 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -169,40 +169,41 @@ function team($, teamName) {
 
     that.limitTarget = function(id, name) {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filterSet.add(filter(id, name));
-	triggerSearch();
+	m_filterSet.add(targetFilter(id, name));
+	if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitQuery = function(field, value) {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.add(filter(null, null, field, value));
-	triggerSearch();
+	m_filterSet.add(fieldFilter(field, value));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitCategory = function(id) {
 	log("limitCategory(id=" + id + ")");
-	// ### Add a filter
-	// ### triggerSearch() if there's a query
+	m_filterSet.add(categoryFilter(id));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitTarget = function(id) {
 	log("delimitTarget(id=" + id + ")");
-	m_filterSet.removeMatching(function(f) { return f.id });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type === 'target' });
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitQuery = function(field, value) {
 	log("delimitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.removeMatching(function(f) { return f.field && field == f.field && value == f.value });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
+                                                 field == f.field && value == f.value });
+        if (m_query) triggerSearch();
 	return false;
     };
 
@@ -260,12 +261,11 @@ function team($, teamName) {
 	resetPage();
 	queue("navi").publish();
 
-
 	// Continue to use previous query/sort-order unless new ones are specified
 	if (query) m_query = query;
 	if (sortOrder) m_sortOrder = sortOrder;
 	if (perpage) m_perpage = perpage;
-	if (targets) m_filterSet.add(filter(id, id));
+	if (targets) m_filterSet.add(targetFilter(id, id));
 
 	var pp2filter = m_filterSet.pp2filter();
 	var pp2limit = m_filterSet.pp2limit(limit);