From 4bc046187aa49a042fb5d7302f029b1e07504786 Mon Sep 17 00:00:00 2001 From: David Back Date: Thu, 13 Sep 2018 15:06:14 -0700 Subject: [PATCH 1/4] fix searching case-sensitivity --- scripts/system/html/js/entityList.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index 615a3c8ddb..d584adfbb5 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -287,9 +287,9 @@ function loaded() { visibleEntities = entities.slice(0); } else { visibleEntities = entities.filter(function(e) { - return e.name.indexOf(searchTerm) > -1 - || e.type.indexOf(searchTerm) > -1 - || e.fullUrl.indexOf(searchTerm) > -1; + return e.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 + || e.type.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 + || e.fullUrl.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1; }); } }); From b65bd6736f2d07629f057ba0d0791ad87e5489a3 Mon Sep 17 00:00:00 2001 From: David Back Date: Thu, 13 Sep 2018 18:20:11 -0700 Subject: [PATCH 2/4] also allow search using entity id --- scripts/system/html/js/entityList.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index d584adfbb5..f691886094 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -289,7 +289,8 @@ function loaded() { visibleEntities = entities.filter(function(e) { return e.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 || e.type.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 - || e.fullUrl.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1; + || e.fullUrl.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 + || e.id.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1; }); } }); From f9480c24a59bd3faec2370d25d956d618c80988a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 13 Sep 2018 20:07:49 -0700 Subject: [PATCH 3/4] store search term lower --- scripts/system/html/js/entityList.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index f691886094..97d1c80fda 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -287,10 +287,11 @@ function loaded() { visibleEntities = entities.slice(0); } else { visibleEntities = entities.filter(function(e) { - return e.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 - || e.type.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 - || e.fullUrl.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1 - || e.id.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1; + var searchTermLower = searchTerm.toLowerCase(); + return e.name.toLowerCase().indexOf(searchTermLower) > -1 + || e.type.toLowerCase().indexOf(searchTermLower) > -1 + || e.fullUrl.toLowerCase().indexOf(searchTermLower) > -1 + || e.id.toLowerCase().indexOf(searchTermLower) > -1; }); } }); From 296e2ba4889dedaaf56a84ac058242fd024eb569 Mon Sep 17 00:00:00 2001 From: David Back Date: Fri, 14 Sep 2018 09:57:27 -0700 Subject: [PATCH 4/4] lowercase search term at start --- scripts/system/html/js/entityList.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index 97d1c80fda..9cfdf6df22 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -282,16 +282,15 @@ function loaded() { function refreshEntityList() { PROFILE("refresh-entity-list", function() { PROFILE("filter", function() { - let searchTerm = elFilter.value; + let searchTerm = elFilter.value.toLowerCase(); if (searchTerm === '') { visibleEntities = entities.slice(0); } else { visibleEntities = entities.filter(function(e) { - var searchTermLower = searchTerm.toLowerCase(); - return e.name.toLowerCase().indexOf(searchTermLower) > -1 - || e.type.toLowerCase().indexOf(searchTermLower) > -1 - || e.fullUrl.toLowerCase().indexOf(searchTermLower) > -1 - || e.id.toLowerCase().indexOf(searchTermLower) > -1; + return e.name.toLowerCase().indexOf(searchTerm) > -1 + || e.type.toLowerCase().indexOf(searchTerm) > -1 + || e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 + || e.id.toLowerCase().indexOf(searchTerm) > -1; }); } });