|
@@ -34,6 +34,7 @@
|
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
|
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
|
|
import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
|
|
import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
|
|
import { mdiPlus, mdiDotsVertical, mdiArrowLeft } from '@mdi/js';
|
|
import { mdiPlus, mdiDotsVertical, mdiArrowLeft } from '@mdi/js';
|
|
|
|
+ import { isExternalUrl } from '$lib/utils/navigation';
|
|
|
|
|
|
export let data: PageData;
|
|
export let data: PageData;
|
|
|
|
|
|
@@ -126,7 +127,7 @@
|
|
onMount(() => {
|
|
onMount(() => {
|
|
const action = $page.url.searchParams.get('action');
|
|
const action = $page.url.searchParams.get('action');
|
|
const getPreviousRoute = $page.url.searchParams.get('previousRoute');
|
|
const getPreviousRoute = $page.url.searchParams.get('previousRoute');
|
|
- if (getPreviousRoute) {
|
|
|
|
|
|
+ if (getPreviousRoute && !isExternalUrl(getPreviousRoute)) {
|
|
previousRoute = getPreviousRoute;
|
|
previousRoute = getPreviousRoute;
|
|
}
|
|
}
|
|
if (action == 'merge') {
|
|
if (action == 'merge') {
|