luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-02 21:14:47 +00:00
Code Issues Projects Releases Wiki Activity

In detailed status view, take displayMedia setting into account when changing media

Browse source 
Fixes #819
This commit is contained in:
Thibaut Girka 2018-11-15 15:35:13 +01:00 committed by ThibG
parent a100f05687
commit 86527024aa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/media_gallery.js
View file

@ -232,7 +232,7 @@ export default class MediaGallery extends React.PureComponent {
componentWillReceiveProps (nextProps) {
if (!is(nextProps.media, this.props.media)) {
this.setState({ visible: !nextProps.sensitive });
this.setState({ visible: nextProps.revealed === undefined ? (displayMedia !== 'hide_all' && !nextProps.sensitive || displayMedia === 'show_all') : nextProps.revealed });
}
}