Fix transitions between apps

jsdelivr · Oct 7, 2024 · de98b60 · de98b60
1 parent 9c73fbd
commit de98b60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/assets/js/app-docs.js b/src/assets/js/app-docs.js
@@ -62,7 +62,7 @@ _.onDocumentReady(() => {
 		state = JSON.parse(document.querySelector('#ractive-data').innerHTML.trim());
 	} catch (e) {}
 
-	app.router.init({ noScroll: true, state });
+	app.router.init({ noScroll: true, state }).watchState();
 
 	// open navbar dropdowns on hover
 	$(document)

diff --git a/src/assets/js/app-globalping.js b/src/assets/js/app-globalping.js
@@ -39,8 +39,12 @@ app.router.addRoute('/sponsors', cGlobalpingSponsors);
 app.router.addRoute('/credits', cGlobalpingCredits);
 
 app.router.addRoute('/(.*)', (route) => {
+	let newUrl = new URL(`${route.uri.path}${route.uri.qs}${route.uri.hash}`, location.href);
+
 	if (!route?.data?.title?.toLowerCase().includes('not found')) {
-		throw new Error('reload');
+		setTimeout(() => {
+			location.href = newUrl.href;
+		});
 	}
 });
 

diff --git a/src/assets/js/app.js b/src/assets/js/app.js
@@ -84,8 +84,12 @@ app.router.addRoute('/oss-cdn/:name', cCustomCdnOssProject);
 app.router.addRoute('/documentation', cDocumentation);
 
 app.router.addRoute('/(.*)', (route) => {
+	let newUrl = new URL(`${route.uri.path}${route.uri.qs}${route.uri.hash}`, location.href);
+
 	if (!route?.data?.title?.toLowerCase().includes('not found')) {
-		throw new Error('reload');
+		setTimeout(() => {
+			location.href = newUrl.href;
+		});
 	}
 });