X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e9624f6c82f155a980c0bdb108930a308272e794;hb=98427bcb4e1139816d533950820071ddd52c9c35;hp=7747094b503c3058d40c3511060477d34e355c24;hpb=df741d8f2e9fc1e083c674431e44867c3ef975a7;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 7747094..e9624f6 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -568,15 +568,13 @@ function team($, teamName) { } - mkws.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) { + if (filter.id) { debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { debug("delimitTarget() keeping filter " + $.toJSON(filter)); @@ -593,16 +591,18 @@ function team($, teamName) { } - mkws.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); } } @@ -628,11 +628,11 @@ function team($, teamName) { } var filter = m_filters[i]; if (filter.id) { - text += M('source') + ': ' + filter.name + ''; + text += M('source') + ': ' + filter.name + ''; } else { - text += M(filter.field) + ': ' + filter.value + ''; } } @@ -1393,6 +1393,13 @@ function _mkws_jquery_plugin ($) { mkws.teams[tname].limitQuery(field, value); } + mkws.delimitTarget = function (tname, id) { + mkws.teams[tname].delimitTarget(id); + } + + mkws.delimitQuery = function (tname, field, value) { + mkws.teams[tname].delimitQuery(field, value); + } function default_mkws_config() { /* default mkws config */