X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=6b2c081a4f260d907cf40a3e336bc8bc63c9eba2;hb=681b0dfe6e140c03eed5776ff37a7961df0de0c7;hp=5b111e56a6797ad245a6b7c09a1fb152c5db221e;hpb=d6d313be78c667fe9fab912c141a7bc1beae7578;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 5b111e5..6b2c081 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -102,11 +102,6 @@ function team($, teamName) {
 		      "termlist": m_config.facets.join(',')
 		    });
 
-    queue("ready").subscribe(function() {
-	log("in 'ready' consumer");
-	that.runAutoSearch();
-    });
-
     // pz2.js event handlers:
     function onInit() {
 	log("init");
@@ -274,6 +269,7 @@ function team($, teamName) {
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
     }
+    that.newSearch = newSearch;
 
 
     function triggerSearch(query, sortOrder, targets)
@@ -460,7 +456,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 {
@@ -573,52 +569,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