diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
| commit | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch) | |
| tree | 5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /app/javascript/mastodon/components/media_gallery.js | |
| parent | 136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff) | |
| parent | b8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff) | |
Merge remote-tracking branch 'origin/merge-upstream'
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) { |