diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
| commit | 020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch) | |
| tree | b9afe17c1257490af354f76d6e1c1f1b3788e546 /app/javascript/mastodon/components/media_gallery.js | |
| parent | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff) | |
| parent | 235c14c79d620d47012a08425324df222a136457 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
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) { |