diff options
| author | ふぁぼ原 <ko_kurihara@yahoo.co.jp> | 2018-09-25 12:09:35 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-09-25 05:09:35 +0200 |
| commit | f7a6f9489da9b2a1820366654df47b8a52f5c5bc (patch) | |
| tree | a0c9017fa701de3e6da02f1b1e3c19671d595fc9 /app/javascript/mastodon/features/account_gallery/components/media_item.js | |
| parent | 4b794e134d427dbc716606324adb9a885a74abec (diff) | |
Add a new preference to always hide all media (#8569)
Diffstat (limited to 'app/javascript/mastodon/features/account_gallery/components/media_item.js')
| -rw-r--r-- | app/javascript/mastodon/features/account_gallery/components/media_item.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js index f7a802dc7..7c330c430 100644 --- a/app/javascript/mastodon/features/account_gallery/components/media_item.js +++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js @@ -2,7 +2,7 @@ import React from 'react'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; import Permalink from '../../../components/permalink'; -import { displaySensitiveMedia } from '../../../initial_state'; +import { displayMedia } from '../../../initial_state'; export default class MediaItem extends ImmutablePureComponent { @@ -11,7 +11,7 @@ export default class MediaItem extends ImmutablePureComponent { }; state = { - visible: !this.props.media.getIn(['status', 'sensitive']) || displaySensitiveMedia, + visible: displayMedia !== 'hide_all' && !this.props.media.getIn(['status', 'sensitive']) || displayMedia === 'show_all', }; handleClick = () => { |