Merge branch 'master' into develop

This commit is contained in:
Simon Cambier
2023-12-16 13:27:26 +01:00
3 changed files with 5 additions and 3 deletions

View File

@@ -1,7 +1,7 @@
{ {
"id": "omnisearch", "id": "omnisearch",
"name": "Omnisearch", "name": "Omnisearch",
"version": "1.19.0", "version": "1.20.0-beta.1",
"minAppVersion": "1.3.0", "minAppVersion": "1.3.0",
"description": "A search engine that just works", "description": "A search engine that just works",
"author": "Simon Cambier", "author": "Simon Cambier",

View File

@@ -39,6 +39,7 @@
} }
$: reg = stringsToRegex(note.foundWords) $: reg = stringsToRegex(note.foundWords)
$: matchesTitle = getMatches(title, reg) $: matchesTitle = getMatches(title, reg)
$: matchesNotePath = getMatches(notePath, reg)
$: matchesExcerpt = cloneDeep(note.matches).map(m => { $: matchesExcerpt = cloneDeep(note.matches).map(m => {
m.offset = m.offset - cleanedContent.offset m.offset = m.offset - cleanedContent.offset
return m return m
@@ -94,7 +95,7 @@
{#if notePath} {#if notePath}
<div class="omnisearch-result__folder-path"> <div class="omnisearch-result__folder-path">
<span bind:this="{elFolderPathIcon}"></span> <span bind:this="{elFolderPathIcon}"></span>
<span>{notePath}</span> <span>{@html highlightText(notePath, matchesNotePath)}</span>
</div> </div>
{/if} {/if}

View File

@@ -121,5 +121,6 @@
"1.18.0": "1.3.0", "1.18.0": "1.3.0",
"1.18.1": "1.3.0", "1.18.1": "1.3.0",
"1.19.0-beta.1": "1.3.0", "1.19.0-beta.1": "1.3.0",
"1.19.0": "1.3.0" "1.19.0": "1.3.0",
"1.20.0-beta.1": "1.3.0"
} }