From: Mike Taylor Date: Tue, 1 Apr 2014 12:20:39 +0000 (+0100) Subject: Use mkws.getParameterByName instead of same-named local function. X-Git-Tag: 1.0.0~1107 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;ds=sidebyside;h=a6d6c725c2c503934bddd381b13dfa4f13010279;p=mkws-moved-to-github.git Use mkws.getParameterByName instead of same-named local function. --- diff --git a/src/mkws-team.js b/src/mkws-team.js index 3ca6437..6b2c081 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -456,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 { @@ -569,16 +569,6 @@ function team($, teamName) { } - // 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