Merge branch 'search-on-search-page' into dev
This commit is contained in:
@@ -14,8 +14,7 @@
|
||||
let companies = $state(null);
|
||||
let documents = $state(null);
|
||||
let fulltext = false;
|
||||
let key = $state(router.getQueryParam('key'));
|
||||
let input = $state(router.getQueryParam('key'));
|
||||
let input = $state(null);
|
||||
let notes = $state(null);
|
||||
let pages = $state(null);
|
||||
let projects = $state(null);
|
||||
@@ -25,16 +24,10 @@
|
||||
|
||||
async function setKey(ev){
|
||||
if (ev) ev.preventDefault();
|
||||
key = input;
|
||||
doSearch(null);
|
||||
doSearch(input);
|
||||
}
|
||||
|
||||
onMount(() => {
|
||||
let params = new URLSearchParams(location.search);
|
||||
key = params.get('key');
|
||||
});
|
||||
|
||||
function doSearch(ignored){
|
||||
function doSearch(key){
|
||||
warn(t('searching…'));
|
||||
let url = window.location.origin + window.location.pathname;
|
||||
if (key) url += '?key=' + encodeURI(key);
|
||||
@@ -182,11 +175,15 @@
|
||||
} else yikes();
|
||||
}
|
||||
|
||||
$effect(() => doSearch(key))
|
||||
$effect(() => {
|
||||
input = router.getQueryParam('key');
|
||||
doSearch(input);
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Umbrella – {t('search')}: {key}</title>
|
||||
<title>Umbrella – {t('search')}{input?': '+input:''}</title>
|
||||
</svelte:head>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user