Merge branch 'main' of github.com:immich-app/immich into pr/YFrendo/5066

This commit is contained in:
Alex Tran
2023-11-22 10:24:07 -06:00
18 changed files with 162 additions and 25 deletions
+2 -2
View File
@@ -72,7 +72,7 @@
afterNavigate(({ from }) => {
// Prevent setting previousRoute to the current page.
if (from && from.route.id !== $page.route.id) {
if (from?.url && from.route.id !== $page.route.id) {
previousRoute = from.url.href;
}
@@ -149,7 +149,7 @@
</section>
{/if}
<section id="search-content" class="relative bg-immich-bg dark:bg-immich-dark-bg">
{#if data.results?.assets?.items.length > 0}
{#if searchResultAssets.length > 0}
<div class="pl-4">
<GalleryViewer assets={searchResultAssets} bind:selectedAssets showArchiveIcon={true} />
</div>