X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=396a2a9e634997a7405e9309838f5f3533de7530;hb=d291399f4d3978b6fe23ac561ac1213816abea85;hp=0a0f6321d24769baf9232b6034b31a8e9f10027f;hpb=cab59791c1404a649cd64c40d9fdccd27a8fbed4;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 0a0f632..396a2a9 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -72,7 +72,7 @@ Handlebars.registerHelper('index1', function(obj) { // Set up global mkws object. Contains truly global state such as SP -// authentication, and a hash of team objects, indexed by windowid. +// authentication, and a hash of team objects, indexed by team-name. // var mkws = { authenticated: false, @@ -456,9 +456,7 @@ function team($, teamName) { } - // ### won't need to be externally visible once onFormSubmitEventHandler() is fixed. - // ### doesn't need windowid - function newSearch(query, sort, targets, windowid) + function newSearch(query, sort, targets) { debug("newSearch: " + query); @@ -471,7 +469,7 @@ function team($, teamName) { redraw_navi(); resetPage(); loadSelect(); - triggerSearch(query, sort, targets, windowid); + triggerSearch(query, sort, targets); switchView('records'); // In case it's configured to start off as hidden m_submitted = true; } @@ -494,8 +492,7 @@ function team($, teamName) { } - // ### doesn't need windowid - function triggerSearch (query, sort, targets, windowid) + function triggerSearch (query, sort, targets) { var pp2filter = ""; var pp2limit = ""; @@ -534,9 +531,7 @@ function team($, teamName) { if (pp2limit) { params.limit = pp2limit; } - if (windowid) { - params.windowid = windowid; - } + debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params)); // We can use: params.torusquery = "udb=NAME" @@ -1168,7 +1163,7 @@ function team($, teamName) { if (targets) s += " in targets '" + targets + "'"; debug(s); - newSearch(query, sort, targets, m_teamName); + newSearch(query, sort, targets); }