projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
976ba74
)
Generate target filters first, then keyword filters separately.
author
Mike Taylor
<mike@indexdata.com>
Wed, 23 Apr 2014 16:13:34 +0000
(17:13 +0100)
committer
Mike Taylor
<mike@indexdata.com>
Wed, 23 Apr 2014 16:13:34 +0000
(17:13 +0100)
src/mkws-widgets.js
patch
|
blob
|
history
diff --git
a/src/mkws-widgets.js
b/src/mkws-widgets.js
index
65c0bb9
..
c04c3f9
100644
(file)
--- a/
src/mkws-widgets.js
+++ b/
src/mkws-widgets.js
@@
-273,13
+273,17
@@
mkws.registerWidgetType('Navi', function() {
for (var i in filters) {
var filter = filters[i];
for (var i in filters) {
var filter = filters[i];
- if (text) {
- text += " | ";
- }
if (filter.id) {
if (filter.id) {
+ if (text) text += " | ";
text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
"', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
"', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
- } else {
+ }
+ }
+
+ for (var i in filters) {
+ var filter = filters[i];
+ if (!filter.id) {
+ if (text) text += " | ";
text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
"', '" + filter.field + "', '" + filter.value + "'" +
');return false;">' + filter.value + '</a>';
text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
"', '" + filter.field + "', '" + filter.value + "'" +
');return false;">' + filter.value + '</a>';