tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new preference to always hide all media (#8569)

Browse Source
This commit is contained in:
ふぁぼ原
2018-09-25 12:09:35 +09:00
committed by Eugen Rochko
parent 4b794e134d
commit f7a6f9489d
14 changed files with 72 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/account_gallery/components/media_item.js
View File

@ -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 = () => {