about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/video
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-04-14 12:27:14 +0200
committerThibaut Girka <thib@sitedethib.com>2018-04-14 12:27:14 +0200
commitdfe8abb8cdb64e88cd7204ad52813e38fb4030a8 (patch)
tree3ef817498ef7a539c34c0941e5357b055dca39e2 /app/javascript/flavours/glitch/features/video
parent95a892accdb6a081447117f49c66431dc7e032fb (diff)
[Glitch] Handle preference to always display sensitive media
Port the UI part of 76f3d5d16be2fb97d2252909589510165ec05e12 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features/video')
-rw-r--r--app/javascript/flavours/glitch/features/video/index.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/video/index.js b/app/javascript/flavours/glitch/features/video/index.js
index ef19a85ec..c6b3f5031 100644
--- a/app/javascript/flavours/glitch/features/video/index.js
+++ b/app/javascript/flavours/glitch/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 'flavours/glitch/util/fullscreen';
+import { displaySensitiveMedia } from 'flavours/glitch/util/initial_state';
 
 const messages = defineMessages({
   play: { id: 'video.play', defaultMessage: 'Play' },
@@ -108,7 +109,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 => {