Merge pull request '[v9.0/forgejo] fix: reset history.scrollRestoration if set to manual and no issue anchor in url' (go-gitea#5753) from bp-v9.0/forgejo-ec4a0e1 into v9.0/forgejo

Earl Warren · Earl Warren · commit d96cef1ac4cf · 2024-11-01T10:10:25.000Z
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5753 Reviewed-by: Otto <otto@codeberg.org> Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
@@ -478,6 +478,9 @@ export function initRepoPullRequestReview() {
         });
       }
     }
+  } else if (window.history.scrollRestoration === 'manual') {
+    // reset scrollRestoration to 'auto' if there is no hash in url and we set it to 'manual' before
+    window.history.scrollRestoration = 'auto';
   }
 
   $(document).on('click', '.show-outdated', function (e) {

Original file line number	Diff line number	Diff line change
`@@ -478,6 +478,9 @@ export function initRepoPullRequestReview() {`
`478`	`478`	`});`
`479`	`479`	`}`
`480`	`480`	`}`
	`481`	`+ } else if (window.history.scrollRestoration === 'manual') {`
	`482`	`+ // reset scrollRestoration to 'auto' if there is no hash in url and we set it to 'manual' before`
	`483`	`+ window.history.scrollRestoration = 'auto';`
`481`	`484`	`}`
`482`	`485`
`483`	`486`	`$(document).on('click', '.show-outdated', function (e) {`