diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-09 00:26:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 00:26:57 +0100 |
| commit | 76f3d5d16be2fb97d2252909589510165ec05e12 (patch) | |
| tree | e46a34d048183f23e5d13dbdda9a0922e86a271f /app/javascript/mastodon/features/video/index.js | |
| parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff) | |
Add preference to always display sensitive media (#6448)
Diffstat (limited to 'app/javascript/mastodon/features/video/index.js')
| -rw-r--r-- | app/javascript/mastodon/features/video/index.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/video/index.js b/app/javascript/mastodon/features/video/index.js index 0ee8bb6c8..7752fc057 100644 --- a/app/javascript/mastodon/features/video/index.js +++ b/app/javascript/mastodon/features/video/index.js @@ -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 => { |