tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2023-10-10 19:53:41 +02:00
2 parents 1a4a23b5c8 27e84c0691
commit 3735e6f79d
7 files changed
+40 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/mastodon/features/status/index.jsx
+1 -1
View File
@@ -619,7 +619,7 @@ class Status extends ImmutablePureComponent {
shouldUpdateScroll = (prevRouterProps, { location }) => {
// Do not change scroll when opening a modal
if (location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
if (location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
return false;
}