From fee76b296e26230f93433ae1a9b87db49bf4a309 Mon Sep 17 00:00:00 2001 From: Sergey Shliakhov Date: Fri, 10 Jan 2020 11:51:53 +0100 Subject: [PATCH 1/3] Case insensitive searching https://github.com/nextcloud/deck/issues/1233 Signed-off-by: Sergey Shliakhov --- js/filters/cardSearchFilter.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/filters/cardSearchFilter.js b/js/filters/cardSearchFilter.js index 3c8edf13b..bef396d2e 100644 --- a/js/filters/cardSearchFilter.js +++ b/js/filters/cardSearchFilter.js @@ -4,20 +4,20 @@ * @author Julius Härtl * * @license GNU AGPL version 3 or any later version - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - * + * */ import app from '../app/App.js'; @@ -31,7 +31,7 @@ app.filter('cardSearchFilter', function() { angular.forEach(cards, function(card){ var _card = card; Object.keys(rules).some(function(rule) { - if(_card[rule].search(rules[rule])>=0) { + if(_card[rule].search(new RegExp(rules[rule], "i"))>=0) { _result[_card.id] = _card; } }); From 6d0e2baad89f4a020b33d31c87581177915cc915 Mon Sep 17 00:00:00 2001 From: Sergey Shliakhov Date: Fri, 10 Jan 2020 13:33:49 +0100 Subject: [PATCH 2/3] Fix code style https://github.com/nextcloud/deck/issues/1233 Signed-off-by: Sergey Shliakhov --- js/filters/cardSearchFilter.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/filters/cardSearchFilter.js b/js/filters/cardSearchFilter.js index bef396d2e..f85304c4e 100644 --- a/js/filters/cardSearchFilter.js +++ b/js/filters/cardSearchFilter.js @@ -31,7 +31,8 @@ app.filter('cardSearchFilter', function() { angular.forEach(cards, function(card){ var _card = card; Object.keys(rules).some(function(rule) { - if(_card[rule].search(new RegExp(rules[rule], "i"))>=0) { + var pattern = rules[rule]; + if(_card[rule].search(new RegExp(pattern, 'i'))>=0) { _result[_card.id] = _card; } }); From bc6b97e3ba0ff81a39abb11c40a7a819f5c6050b Mon Sep 17 00:00:00 2001 From: Sergey Shliakhov Date: Mon, 13 Jan 2020 05:36:30 +0100 Subject: [PATCH 3/3] Disable eslint rule Signed-off-by: Sergey Shliakhov --- js/filters/cardSearchFilter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/filters/cardSearchFilter.js b/js/filters/cardSearchFilter.js index f85304c4e..3b99fd8dd 100644 --- a/js/filters/cardSearchFilter.js +++ b/js/filters/cardSearchFilter.js @@ -32,6 +32,7 @@ app.filter('cardSearchFilter', function() { var _card = card; Object.keys(rules).some(function(rule) { var pattern = rules[rule]; + // eslint-disable-next-line detect-non-literal-regexp if(_card[rule].search(new RegExp(pattern, 'i'))>=0) { _result[_card.id] = _card; }