Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add preference to always display sensitive media (#6448)

Browse source
This commit is contained in:
Eugen Rochko 2018-02-09 00:26:57 +01:00 • committed by GitHub
parent 1167c6dbf8
commit 76f3d5d16b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/video/index.js
View file

@ -4,6 +4,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import { throttle } from 'lodash';
import classNames from 'classnames';
import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
import { displaySensitiveMedia } from '../../initial_state';
const messages = defineMessages({
play: { id: 'video.play', defaultMessage: 'Play' },
@ -107,7 +108,7 @@ export default class Video extends React.PureComponent {
fullscreen: false,
hovered: false,
muted: false,
revealed: !this.props.sensitive,
revealed: !this.props.sensitive || displaySensitiveMedia,
};
setPlayerRef = c => {