X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e04721562aa1679350e98ec9441070d7d3487636;hb=2fab8dcd05783b47f38ec46188e612187e84223d;hp=dc3d82c57b9302002e3f30f290928704cdc49656;hpb=89016e5c5e5c0a4fcdcd3d8fcfd78d8e8ed99077;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index dc3d82c..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; @@ -1227,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 + "=([^&#]*)"),