triggerSearch correctly handles the targets parameter once more.

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 08f67b3..a76c65c 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -186,7 +186,7 @@ function team($, teamName) {
     that.limitCategory = function(id) {
        log("limitCategory(id=" + id + ")");
         // Only one category filter at a time
-       m_filterSet.removeMatching(function(f) { return f.type === 'category' });        
+       m_filterSet.removeMatching(function(f) { return f.type === 'category' });
         if (id !== '') m_filterSet.add(categoryFilter(id));
         if (m_query) triggerSearch();
        return false;
@@ -267,7 +267,7 @@ function team($, teamName) {
        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);
@@ -420,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
@@ -441,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";
@@ -477,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> '
            }
        }