treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

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

Fixes #819
lolsob-rspec
Thibaut Girka 2018-11-15 15:35:13 +01:00 committed by ThibG
parent 10ec788f5d
commit ca163ec35d
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 });
}
}