X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e04721562aa1679350e98ec9441070d7d3487636;hp=1a4f528912bd8245aedc45b07c7fa37d73763e57;hb=9102c6dd9e9aa1c442bbfe5bf1baa6a3da7ffce8;hpb=7996293a0382e932c323f62d793d3fbb1bee9e95

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 1a4f528..e047215 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -847,7 +847,7 @@ function team($, teamName) {
 
 
     function mkwsSetLang()  {
-	var lang = mkws.parseQuerystring().lang || mkws_config.lang;
+	var lang = mkws.getParameterByName("lang") || mkws_config.lang;
 	if (!lang || !mkws.locale_lang[lang]) {
 	    mkws_config.lang = ""
 	} else {
@@ -961,8 +961,7 @@ function team($, teamName) {
 
 
     that.runAutoSearch = function() {
-	// ### should check mkwsTermlist as well, for facet-only teams
-	var node = findnode('.mkwsRecords');
+	var node = findnode('.mkwsRecords,.mkwsTermlists');
 	var query = node.attr('autosearch');
 	if (!query)
 	    return;
@@ -997,7 +996,11 @@ function team($, teamName) {
     }
 
 
-    /* locale */
+    // 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
+    // different languages.
+    //
     function M(word) {
 	var lang = mkws_config.lang;
 
@@ -1223,22 +1226,8 @@ function team($, teamName) {
     }
 
 
-    // implement $.parseQuerystring() for parsing URL parameters
-    mkws.parseQuerystring = function() {
-	var nvpair = {};
-	var qs = window.location.search.replace('?', '');
-	var pairs = qs.split('&');
-	$.each(pairs, function(i, v){
-	    var pair = v.split('=');
-	    nvpair[pair[0]] = pair[1];
-	});
-	return nvpair;
-    }
-
-
     // This function is taken from a StackOverflow answer
     // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
-    // ### should we unify this and parseQuerystring()?
     mkws.getParameterByName = function(name) {
 	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
 	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),