gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Minor account media gallery fixes (#10695)

Browse source 
* Make the cursor icon consistant across media types in account media gallery

* Fix the video player modal causing scroll position to reset
This commit is contained in:
ThibG 2019-05-04 17:36:43 +02:00 • committed by Eugen Rochko
parent c88d9e524b
commit 4f73cde4e1
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/features/ui/index.js
View file

@ -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 <Status /> 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(() => {