diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-06 18:53:49 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-10-07 12:08:32 +0200 |
| commit | 7cc78431092edb0996372bc93bbc398a34af2395 (patch) | |
| tree | 461f4e9ae1fc6cdc3765e205477d252d6e6e77f9 /app/javascript/flavours/glitch/features/blocks | |
| parent | f990b9c76828c791e86d58e02bf6eadf80c88ce5 (diff) | |
Do not scroll timelines when *closing* media modals
Media modals push an history state so that pressing back on mobile closes them. We made sure to not scroll when opening them, but not when *closing* them, which caused some issues in rare cases.
Diffstat (limited to 'app/javascript/flavours/glitch/features/blocks')
| -rw-r--r-- | app/javascript/flavours/glitch/features/blocks/index.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/blocks/index.js b/app/javascript/flavours/glitch/features/blocks/index.js index 4c8b16504..386a0ce63 100644 --- a/app/javascript/flavours/glitch/features/blocks/index.js +++ b/app/javascript/flavours/glitch/features/blocks/index.js @@ -43,7 +43,8 @@ export default class Blocks extends ImmutablePureComponent { } shouldUpdateScroll = (prevRouterProps, { location }) => { - return !(location.state && location.state.mastodonModalOpen) + if ((((prevRouterProps || {}).location || {}).state || {}).mastodonModalOpen) return false; + return !(location.state && location.state.mastodonModalOpen); } render () { |