chmod 444 for read-only generated files instead of -w.

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

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 8052eb9..2ae79bd 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -102,10 +102,6 @@ function team($, teamName) {
                      "termlist": m_config.facets.join(',')
                    });
 
-    queue("ready").subscribe(function() {
-       that.runAutoSearch();
-    });
-
     // pz2.js event handlers:
     function onInit() {
        log("init");
@@ -259,7 +255,7 @@ function team($, teamName) {
     that.resetPage = resetPage;
 
 
-    function newSearch(query, sortOrder, targets)
+    function newSearch(query, sortOrder, perpage, targets)
     {
        log("newSearch: " + query);
 
@@ -269,13 +265,14 @@ function team($, teamName) {
        }
 
        m_filters = []
-       triggerSearch(query, sortOrder, targets);
+       triggerSearch(query, sortOrder, perpage, targets);
        switchView('records'); // In case it's configured to start off as hidden
        m_submitted = true;
     }
+    that.newSearch = newSearch;
 
 
-    function triggerSearch(query, sortOrder, targets)
+    function triggerSearch(query, sortOrder, perpage, targets)
     {
        resetPage();
        queue("navi").publish();
@@ -290,6 +287,9 @@ function team($, teamName) {
        if (sortOrder) {
            m_sortOrder = sortOrder;
        }
+       if (perpage) {
+           m_perpage = perpage;
+       }
        if (targets) {
            m_filters.push({ id: targets, name: targets });
        }
@@ -459,7 +459,7 @@ function team($, teamName) {
 
 
     function mkwsSetLang()  {
-       var lang = getParameterByName("lang") || m_config.lang;
+       var lang = mkws.getParameterByName("lang") || m_config.lang;
        if (!lang || !mkws.locale_lang[lang]) {
            m_config.lang = ""
        } else {
@@ -572,52 +572,6 @@ function team($, teamName) {
     }
 
 
-    that.runAutoSearch = function() {
-       var node = findnode('.mkwsRecords,.mkwsTermlists');
-       var query = node.attr('autosearch');
-       if (!query)
-           return;
-
-       if (query.match(/^!param!/)) {
-           var param = query.replace(/^!param!/, '');
-           query = getParameterByName(param);
-           log("obtained query '" + query + "' from param '" + param + "'");
-           if (!query) {
-               alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
-           }
-       } else if (query.match(/^!path!/)) {
-           var index = query.replace(/^!path!/, '');
-           var path = window.location.pathname.split('/');
-           query = path[path.length - index];
-           log("obtained query '" + query + "' from path-component '" + index + "'");
-           if (!query) {
-               alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
-           }
-       }
-
-       log("node=" + node + ", class='" + node.className + "', query=" + query);
-
-       var sortOrder = node.attr('sort');
-       var targets = node.attr('targets');
-       var s = "running auto search: '" + query + "'";
-       if (sortOrder) s += " sorted by '" + sortOrder + "'";
-       if (targets) s += " in targets '" + targets + "'";
-       log(s);
-
-       newSearch(query, sortOrder, targets);
-    };
-
-
-    // This function is taken from a StackOverflow answer
-    // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
-    function getParameterByName(name) {
-       name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-       var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-           results = regex.exec(location.search);
-       return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-    }
-
-
     // Translation function. At present, this is properly a
     // global-level function (hence the assignment to mkws.M) but we
     // want to make it per-team so different teams can operate in