Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • 987FCF504483CBC8/toolkit
1 result
Show changes
Commits on Source (2)
...@@ -44,7 +44,9 @@ export class Router { ...@@ -44,7 +44,9 @@ export class Router {
// In case of a router redirect, set the new location // In case of a router redirect, set the new location
if (newPathname !== oldPathName) { if (newPathname !== oldPathName) {
const referrerUrl = location.href; const referrerUrl = location.href;
window.history.replaceState({}, '', newPathname); if (!newPathname.endsWith('/root')) {
window.history.replaceState({}, '', newPathname);
}
this.dispatchLocationChanged(referrerUrl); this.dispatchLocationChanged(referrerUrl);
} }
this.setState(page); this.setState(page);
...@@ -66,7 +68,9 @@ export class Router { ...@@ -66,7 +68,9 @@ export class Router {
if (newPathname === oldPathname) if (newPathname === oldPathname)
return; return;
const referrerUrl = location.href; const referrerUrl = location.href;
window.history.pushState({}, '', newPathname); if (!newPathname.endsWith('/root')) {
window.history.pushState({}, '', newPathname);
}
this.dispatchLocationChanged(referrerUrl); this.dispatchLocationChanged(referrerUrl);
}); });
} }
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<link rel="shortcut icon" type="image/x-icon" href="<%= getPrivateUrl('favicon.ico') %>"> <link rel="shortcut icon" type="image/x-icon" href="<%= getPrivateUrl('favicon.ico') %>">
<link rel="icon" type="image/svg+xml" href="<%= getPrivateUrl('favicon.svg') %>" sizes="any"> <link rel="icon" type="image/svg+xml" href="<%= getPrivateUrl('favicon.svg') %>" sizes="any">
<!-- PWA manfiest file --> <!-- PWA manifest file -->
<link rel="manifest" href="<%= getUrl(name + '.manifest.json') %>"> <link rel="manifest" href="<%= getUrl(name + '.manifest.json') %>">
<!-- Loading spinner --> <!-- Loading spinner -->
......