Spaces:
Running
on
CPU Upgrade
Running
on
CPU Upgrade
fix(nav): issue with from.url when loading page directly
Browse files
src/routes/settings/(nav)/+layout.svelte
CHANGED
|
@@ -54,8 +54,8 @@
|
|
| 54 |
});
|
| 55 |
|
| 56 |
afterNavigate(({ from }) => {
|
| 57 |
-
if (
|
| 58 |
-
previousPage = from
|
| 59 |
}
|
| 60 |
// Show content when not on the root settings page
|
| 61 |
showContent = page.url.pathname !== `${base}/settings`;
|
|
|
|
| 54 |
});
|
| 55 |
|
| 56 |
afterNavigate(({ from }) => {
|
| 57 |
+
if (from?.url && !from.url.pathname.includes("settings")) {
|
| 58 |
+
previousPage = from.url.toString() || previousPage || base;
|
| 59 |
}
|
| 60 |
// Show content when not on the root settings page
|
| 61 |
showContent = page.url.pathname !== `${base}/settings`;
|
src/routes/settings/+layout.svelte
CHANGED
|
@@ -15,8 +15,8 @@
|
|
| 15 |
let previousPage: string = $state(base);
|
| 16 |
|
| 17 |
afterNavigate(({ from }) => {
|
| 18 |
-
if (
|
| 19 |
-
previousPage = from
|
| 20 |
}
|
| 21 |
});
|
| 22 |
|
|
|
|
| 15 |
let previousPage: string = $state(base);
|
| 16 |
|
| 17 |
afterNavigate(({ from }) => {
|
| 18 |
+
if (from?.url && !from.url.pathname.includes("settings")) {
|
| 19 |
+
previousPage = from.url.toString() || previousPage || base;
|
| 20 |
}
|
| 21 |
});
|
| 22 |
|
src/routes/tools/[toolId]/+page.svelte
CHANGED
|
@@ -28,8 +28,8 @@
|
|
| 28 |
let previousPage: string = $state(base);
|
| 29 |
|
| 30 |
afterNavigate(({ from }) => {
|
| 31 |
-
if (
|
| 32 |
-
previousPage = from
|
| 33 |
}
|
| 34 |
});
|
| 35 |
|
|
|
|
| 28 |
let previousPage: string = $state(base);
|
| 29 |
|
| 30 |
afterNavigate(({ from }) => {
|
| 31 |
+
if (from?.url && !from.url.pathname.includes("tools/")) {
|
| 32 |
+
previousPage = from.url.toString() || previousPage || base;
|
| 33 |
}
|
| 34 |
});
|
| 35 |
|