X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=a76c65cbe92e126caabeaef6bf2a98eb3bbe17f2;hb=c8965c7ef5c9777b0aab59b9b6e8a141ee200f09;hp=d99370d6ac5d1d0aa3627f7e17aa7a68eaa1aa05;hpb=0e5fc9c87c4a2c8d3cecaa0e389bd2f4d8ccea28;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index d99370d..a76c65c 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -170,7 +170,7 @@ function team($, teamName) {
     that.limitTarget = function(id, name) {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
 	m_filterSet.add(targetFilter(id, name));
-	triggerSearch();
+	if (m_query) triggerSearch();
 	return false;
     };
 
@@ -178,15 +178,17 @@ function team($, teamName) {
     that.limitQuery = function(field, value) {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
 	m_filterSet.add(fieldFilter(field, value));
-	triggerSearch();
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitCategory = function(id) {
 	log("limitCategory(id=" + id + ")");
-	// ### Add a filter
-	// ### triggerSearch() if there's a query
+        // Only one category filter at a time
+	m_filterSet.removeMatching(function(f) { return f.type === 'category' });
+        if (id !== '') m_filterSet.add(categoryFilter(id));
+        if (m_query) triggerSearch();
 	return false;
     };
 
@@ -194,7 +196,7 @@ function team($, teamName) {
     that.delimitTarget = function(id) {
 	log("delimitTarget(id=" + id + ")");
 	m_filterSet.removeMatching(function(f) { return f.type === 'target' });
-	triggerSearch();
+        if (m_query) triggerSearch();
 	return false;
     };
 
@@ -203,7 +205,7 @@ function team($, teamName) {
 	log("delimitQuery(field=" + field + ", value=" + value + ")");
 	m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
                                                  field == f.field && value == f.value });
-	triggerSearch();
+        if (m_query) triggerSearch();
 	return false;
     };
 
@@ -249,7 +251,7 @@ function team($, teamName) {
 	    return;
 	}
 
-	m_filterSet = filterSet(that);
+	m_filterSet.removeMatching(function(f) { return f.type !== 'category' });
 	triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
@@ -261,15 +263,18 @@ 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(targetFilter(id, id));
+	if (targets) m_filterSet.add(targetFilter(targets, targets));
 
 	var pp2filter = m_filterSet.pp2filter();
 	var pp2limit = m_filterSet.pp2limit(limit);
+        var pp2catLimit = m_filterSet.pp2catLimit();
+	if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
 	var params = {};
 	if (pp2limit) params.limit = pp2limit;
@@ -415,7 +420,10 @@ function team($, teamName) {
 	});
 
 	// on first page, hide the termlist
-	$(document).ready(function() { widgetNode("Termlists").hide(); });
+	$(document).ready(function() {
+            var t = widgetNode("Termlists");
+            if (t) t.hide();
+        });
         var container = findnode(".mkwsMOTDContainer");
 	if (container.length) {
 	    // Move the MOTD from the provided element down into the container
@@ -436,7 +444,27 @@ function team($, teamName) {
 	return m_config.lang;
     }
 
+    // set or re-set "lang" URL parameter
+    function lang_url(lang) {
+	var query = location.search;
+	// no query parameters? done
+	if (!query) {
+	    return "?lang=" + lang;
+	}
 
+	// parameter does not exists
+	if (!query.match(/[\?&]lang=/)) {
+            return query + "&lang=" + lang;
+        }
+
+	// replace existing parameter
+	query = query.replace(/\?lang=([^&#;]*)/, "?lang=" + lang);
+	query = query.replace(/\&lang=([^&#;]*)/, "&lang=" + lang);
+
+	return query;
+    }
+   
+	// dynamic URL or static page? /path/foo?query=test
     /* create locale language menu */
     function mkwsHtmlLang() {
 	var lang_default = "en";
@@ -472,7 +500,7 @@ function team($, teamName) {
 	    if (lang == l) {
 		data += ' <span>' + l + '</span> ';
 	    } else {
-		data += ' <a href="?lang=' + l + '">' + l + '</a> '
+		data += ' <a href="' + lang_url(l) + '">' + l + '</a> '
 	    }
 	}