summaryrefslogtreecommitdiff
path: root/assets/js/src
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-04-24 18:07:05 -0400
committerFrederic Guillot <fred@kanboard.net>2016-04-24 18:07:05 -0400
commit36bdcf193b6d54eefe27f58689c44953715a4dad (patch)
treee64a4ce158bbb37373a318b36ad32a83cb529b26 /assets/js/src
parentf74d7ef209701bba905c0179b30f24a6e3faa5db (diff)
Category and user filters do not append anymore in search field
Diffstat (limited to 'assets/js/src')
-rw-r--r--assets/js/src/Search.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/assets/js/src/Search.js b/assets/js/src/Search.js
index ce753246..f6409f54 100644
--- a/assets/js/src/Search.js
+++ b/assets/js/src/Search.js
@@ -16,15 +16,21 @@ Kanboard.Search.prototype.focus = function() {
};
Kanboard.Search.prototype.listen = function() {
- // Filter helper for search
$(document).on("click", ".filter-helper", function (e) {
e.preventDefault();
var filter = $(this).data("filter");
var appendFilter = $(this).data("append-filter");
+ var uniqueFilter = $(this).data("unique-filter");
var input = $("#form-search");
- if (appendFilter) {
+ if (uniqueFilter) {
+ var attribute = uniqueFilter.substr(0, uniqueFilter.indexOf(':'));
+ filter = input.val().replace(new RegExp('(' + attribute + ':[#a-z0-9]+)', 'g'), '');
+ filter = filter.replace(new RegExp('(' + attribute + ':"(.+)")', 'g'), '');
+ filter = filter.trim();
+ filter += ' ' + uniqueFilter;
+ } else if (appendFilter) {
filter = input.val() + " " + appendFilter;
}