From 98427bcb4e1139816d533950820071ddd52c9c35 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Fri, 7 Feb 2014 15:39:26 +0000 Subject: [PATCH] Swap order of that.delimitTarget() and that.delimitQuery() to match how we do things elsewhere. --- tools/htdocs/mkws.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index b1a04d7..e9624f6 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -568,18 +568,16 @@ function team($, teamName) { } - that.delimitQuery = function (field, value) + that.delimitTarget = function (id) { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); + debug("delimitTarget(id=" + id + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.field && - field == filter.field && - value == filter.value) { - debug("delimitQuery() removing filter " + $.toJSON(filter)); + if (filter.id) { + debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { - debug("delimitQuery() keeping filter " + $.toJSON(filter)); + debug("delimitTarget() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -593,16 +591,18 @@ function team($, teamName) { } - that.delimitTarget = function (id) + that.delimitQuery = function (field, value) { - debug("delimitTarget(id=" + id + ")"); + debug("delimitQuery(field=" + field + ", value=" + value + ")"); var newFilters = []; for (var i in m_filters) { var filter = m_filters[i]; - if (filter.id) { - debug("delimitTarget() removing filter " + $.toJSON(filter)); + if (filter.field && + field == filter.field && + value == filter.value) { + debug("delimitQuery() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + $.toJSON(filter)); + debug("delimitQuery() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } -- 1.7.10.4