Merge pull request #5711 from sbwalker/dev
remove custom scroll position script for static rendering as this is fixed in .NET 10
This commit is contained in:
@@ -197,10 +197,6 @@
|
|||||||
{
|
{
|
||||||
_scripts += CreatePWAScript(alias, site, route);
|
_scripts += CreatePWAScript(alias, site, route);
|
||||||
}
|
}
|
||||||
@if (_renderMode == RenderModes.Static)
|
|
||||||
{
|
|
||||||
_scripts += CreateScrollPositionScript();
|
|
||||||
}
|
|
||||||
|
|
||||||
// set culture if not specified
|
// set culture if not specified
|
||||||
string cultureCookie = Context.Request.Cookies[Shared.CookieRequestCultureProvider.DefaultCookieName];
|
string cultureCookie = Context.Request.Cookies[Shared.CookieRequestCultureProvider.DefaultCookieName];
|
||||||
@@ -510,25 +506,6 @@
|
|||||||
"</script>" + Environment.NewLine;
|
"</script>" + Environment.NewLine;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string CreateScrollPositionScript()
|
|
||||||
{
|
|
||||||
return Environment.NewLine +
|
|
||||||
"<script>" + Environment.NewLine +
|
|
||||||
" // Blazor Static Rendering Scroll Position" + Environment.NewLine +
|
|
||||||
" window.interceptNavigation = () => {" + Environment.NewLine +
|
|
||||||
" let currentUrl = window.location.pathname;" + Environment.NewLine +
|
|
||||||
" Blazor.addEventListener('enhancedload', () => {" + Environment.NewLine +
|
|
||||||
" let newUrl = window.location.pathname;" + Environment.NewLine +
|
|
||||||
" if (currentUrl !== newUrl || window.location.hash === '#top') {" + Environment.NewLine +
|
|
||||||
" window.scrollTo({ top: 0, left: 0, behavior: 'instant' });" + Environment.NewLine +
|
|
||||||
" }" + Environment.NewLine +
|
|
||||||
" currentUrl = newUrl;" + Environment.NewLine +
|
|
||||||
" });" + Environment.NewLine +
|
|
||||||
" };" + Environment.NewLine +
|
|
||||||
" document.onload += window.interceptNavigation();" + Environment.NewLine +
|
|
||||||
"</script>" + Environment.NewLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AddScript(Resource resource, Alias alias)
|
private void AddScript(Resource resource, Alias alias)
|
||||||
{
|
{
|
||||||
var script = CreateScript(resource, alias);
|
var script = CreateScript(resource, alias);
|
||||||
|
|||||||
Reference in New Issue
Block a user