From 4f73cde4e136320e9325d7f43232c5a614874388 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 4 May 2019 17:36:43 +0200 Subject: Minor account media gallery fixes (#10695) * Make the cursor icon consistant across media types in account media gallery * Fix the video player modal causing scroll position to reset --- app/javascript/mastodon/features/ui/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/javascript/mastodon/features/ui/index.js') diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index c14eba992..1fcea779d 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -47,7 +47,8 @@ import { Lists, } from './util/async-components'; import { me } from '../../initial_state'; -import { previewState } from './components/media_modal'; +import { previewState as previewMediaState } from './components/media_modal'; +import { previewState as previewVideoState } from './components/video_modal'; // Dummy import, to make sure that ends up in the application bundle. // Without this it ends up in ~8 very commonly used bundles. @@ -121,7 +122,7 @@ class SwitchingColumnsArea extends React.PureComponent { } shouldUpdateScroll (_, { location }) { - return location.state !== previewState; + return location.state !== previewMediaState && location.state !== previewVideoState; } handleResize = debounce(() => { -- cgit