diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-09 00:26:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 00:26:57 +0100 |
commit | 76f3d5d16be2fb97d2252909589510165ec05e12 (patch) | |
tree | e46a34d048183f23e5d13dbdda9a0922e86a271f /app/javascript/mastodon/components/media_gallery.js | |
parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff) |
Add preference to always display sensitive media (#6448)
Diffstat (limited to 'app/javascript/mastodon/components/media_gallery.js')
-rw-r--r-- | app/javascript/mastodon/components/media_gallery.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js index 20febdb16..a276b17d5 100644 --- a/app/javascript/mastodon/components/media_gallery.js +++ b/app/javascript/mastodon/components/media_gallery.js @@ -6,7 +6,7 @@ import IconButton from './icon_button'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { isIOS } from '../is_mobile'; import classNames from 'classnames'; -import { autoPlayGif } from '../initial_state'; +import { autoPlayGif, displaySensitiveMedia } from '../initial_state'; const messages = defineMessages({ toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' }, @@ -187,7 +187,7 @@ export default class MediaGallery extends React.PureComponent { }; state = { - visible: !this.props.sensitive, + visible: !this.props.sensitive || displaySensitiveMedia, }; componentWillReceiveProps (nextProps) { |