Skip to content

Commit 32f0426

Browse files
committed
Fix issues searching with a space in the search string (fix espruino/BangleApps#3898)
1 parent 0916756 commit 32f0426

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

js/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,8 @@ function refreshLibrary(options) {
682682
Utils.searchRelevance(app.description, searchValue)/5 + // match on description, but pay less attention
683683
((app.tags && app.tags.includes(searchValue))?10:0)
684684
}));
685+
} else {
686+
console.warn("Unknown search type "+searchType, searchValue);
685687
}
686688
// Now finally, filter, sort based on relevance and set the search result
687689
visibleApps = searchResult.filter(a => a.relevance>0).sort((a,b) => (b.relevance-(0|b.sortorder)) - (a.relevance-(0|a.sortorder))).map(a => a.app);
@@ -690,11 +692,12 @@ function refreshLibrary(options) {
690692
if (!sortedByRelevance)
691693
visibleApps.sort(appSorter);
692694

693-
if (activeSort) {
695+
if (activeSort && !searchValue) { // only sort if not searching (searching already sorts)
694696
if (["created","modified","installs","favourites"].includes(activeSort)) {
695-
visibleApps = visibleApps.sort((a,b) =>
697+
visibleApps = visibleApps.sort((a,b) => {
696698
((appSortInfo[b.id]||{})[activeSort]||0) -
697699
((appSortInfo[a.id]||{})[activeSort]||0));
700+
});
698701
} else throw new Error("Unknown sort type "+activeSort);
699702
}
700703

js/utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ function searchRelevance(value, searchString) {
338338
let partRelevance = 0;
339339
let valueParts = value.split(/[\s(),.-]/).filter(p=>p.length);
340340
searchString.split(/[\s-(),.-]/).forEach(search=>{
341+
if (search==="") return; // ignore empty search strings
341342
valueParts.forEach(v=>{
342343
if (v==search)
343344
partRelevance += 20; // if a complete match, +20

0 commit comments

Comments
 (0)