[refactor] improve searching bookmarks

Author: zombieFox

src/js/search.js

@@ -42,16 +42,11 @@ var search = (function(){
 };
 searchedBookmarks.total=bookmarks.get().length;
 bookmarks.get().forEach(function(arrayItem,index){
-if(arrayItem.url!=null){
-if(arrayItem.url.replace(/^https?\:\/\//i,"").replace(/\/$/,"").toLowerCase().includes(searchInput.value.toLowerCase().replace(/\s/g,""))){
-varbookmarkDataCopy=JSON.parse(JSON.stringify(arrayItem));
-searchedBookmarks.matching.push(bookmarkDataCopy);
-};
-}elseif(arrayItem.name!=null){
-if(arrayItem.name.toLowerCase().includes(searchInput.value.toLowerCase().replace(/\s/g,""))){
-varbookmarkDataCopy=JSON.parse(JSON.stringify(arrayItem));
-searchedBookmarks.matching.push(bookmarkDataCopy);
-};
+varmatchUrl=(arrayItem.url!=null)&&(arrayItem.url.replace(/^https?\:\/\//i,"").replace(/\/$/,"").toLowerCase().includes(searchInput.value.toLowerCase().replace(/\s/g,"")));
+varmatchName=(arrayItem.name!=null)&&(arrayItem.name.toLowerCase().includes(searchInput.value.toLowerCase().replace(/\s/g,"")));
+if(matchUrl||matchName){
+varbookmarkDataCopy=JSON.parse(JSON.stringify(arrayItem));
+searchedBookmarks.matching.push(bookmarkDataCopy);
 };
 });
 returnsearchedBookmarks;

src/js/version.js

@@ -1,6 +1,6 @@
 varversion=(function(){
 
-varcurrent="3.60.0";
+varcurrent="3.61.0";
 
 varcompare=function(a,b){
 varpa=a.split(".");

src/manifest.json

@@ -2,7 +2,7 @@
 "name": "nightTab",
 "short_name": "nightTab",
 "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.",
-"version": "3.60.0",
+"version": "3.61.0",
 "manifest_version": 2,
 "chrome_url_overrides":{
 "newtab": "index.html"