From bc9168431473fe5ba45b1eafc5d4bc9f05000cc0 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 3 Mar 2014 15:19:54 +0000 Subject: [PATCH] Remove explicit windowid parameter from newSearch() and triggerSearch() This is not needed, as the team-name is passed into the pz2 constructor. --- tools/htdocs/mkws.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index b59a8d2..e47dc82 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -456,8 +456,7 @@ function team($, teamName) { } - // ### doesn't need windowid - function newSearch(query, sort, targets, windowid) + function newSearch(query, sort, targets) { debug("newSearch: " + query); @@ -470,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; } @@ -493,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 = ""; @@ -533,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" @@ -1167,7 +1163,7 @@ function team($, teamName) { if (targets) s += " in targets '" + targets + "'"; debug(s); - newSearch(query, sort, targets, m_teamName); + newSearch(query, sort, targets); } -- 1.7.10.4