projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Swap order of that.delimitTarget() and that.delimitQuery() to match
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
c79c1e0
..
e9624f6
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-542,11
+542,11
@@
function team($, teamName) {
}
}
- // limit the query after clicking the facet
- that.limitQuery = function (field, value)
+ // limit by target functions
+ that.limitTarget = function (id, name)
{
{
- debug("limitQuery(field=" + field + ", value=" + value + ")");
- m_filters.push({ field: field, value: value });
+ debug("limitTarget(id=" + id + ", name=" + name + ")");
+ m_filters.push({ id: id, name: name });
redraw_navi();
resetPage();
loadSelect();
redraw_navi();
resetPage();
loadSelect();
@@
-555,11
+555,11
@@
function team($, teamName) {
}
}
- // limit by target functions
- that.limitTarget = function (id, name)
+ // limit the query after clicking the facet
+ that.limitQuery = function (field, value)
{
{
- debug("limitTarget(id=" + id + ", name=" + name + ")");
- m_filters.push({ id: id, name: name });
+ debug("limitQuery(field=" + field + ", value=" + value + ")");
+ m_filters.push({ field: field, value: value });
redraw_navi();
resetPage();
loadSelect();
redraw_navi();
resetPage();
loadSelect();
@@
-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];
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));
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];
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 {
} else {
- debug("delimitTarget() keeping filter " + $.toJSON(filter));
+ debug("delimitQuery() keeping filter " + $.toJSON(filter));
newFilters.push(filter);
}
}
newFilters.push(filter);
}
}
@@
-628,11
+628,11
@@
function team($, teamName) {
}
var filter = m_filters[i];
if (filter.id) {
}
var filter = m_filters[i];
if (filter.id) {
- text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(' +
- "'" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+ text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
+ "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
} else {
} else {
- text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(' +
- "'" + filter.field + "', '" + filter.value + "'" +
+ text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
+ "', '" + filter.field + "', '" + filter.value + "'" +
');return false;">' + filter.value + '</a>';
}
}
');return false;">' + filter.value + '</a>';
}
}
@@
-1393,6
+1393,13
@@
function _mkws_jquery_plugin ($) {
mkws.teams[tname].limitQuery(field, value);
}
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 */
function default_mkws_config() {
/* default mkws config */