From: Mike Taylor <mike@indexdata.com>
Date: Wed, 23 Apr 2014 16:13:34 +0000 (+0100)
Subject: Generate target filters first, then keyword filters separately.
X-Git-Tag: 1.0.0~875
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=94988acacdecf63dec5e58eff7fac807f0928139;p=mkws-moved-to-github.git

Generate target filters first, then keyword filters separately.
---

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 65c0bb9..c04c3f9 100644
--- 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];
-	    if (text) {
-		text += " | ";
-	    }
 	    if (filter.id) {
+		if (text) text += " | ";
 		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>';