commit: f4e28785f1be40b67812bf0711e78a5f229c4eed
parent: c8e4b9c66350e3a3f1b5fee6812f7e7eb97c0677
Author: Eugen <eugen@zeonfederated.com>
Date: Fri, 20 Jan 2017 13:27:20 +0100
Merge pull request #502 from blackle/vistoggle
Show visibility toggle on videos, show regardless of sensitivity
Diffstat:
2 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/app/assets/javascripts/components/components/media_gallery.jsx b/app/assets/javascripts/components/components/media_gallery.jsx
@@ -49,7 +49,7 @@ const MediaGallery = React.createClass({
getInitialState () {
return {
- visible: false
+ visible: !this.props.sensitive
};
},
@@ -80,13 +80,22 @@ const MediaGallery = React.createClass({
let children;
- if (sensitive && !this.state.visible) {
- children = (
- <div style={spoilerStyle} onClick={this.handleOpen}>
- <span style={spoilerSpanStyle}><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
- <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
- </div>
- );
+ if (!this.state.visible) {
+ if (sensitive) {
+ children = (
+ <div style={spoilerStyle} onClick={this.handleOpen}>
+ <span style={spoilerSpanStyle}><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
+ <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
+ </div>
+ );
+ } else {
+ children = (
+ <div style={spoilerStyle} onClick={this.handleOpen}>
+ <span style={spoilerSpanStyle}><FormattedMessage id='status.media_hidden' defaultMessage='Media hidden' /></span>
+ <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
+ </div>
+ );
+ }
} else {
const size = media.take(4).size;
@@ -147,20 +156,12 @@ const MediaGallery = React.createClass({
);
});
}
-
- let spoilerButton;
-
- if (sensitive) {
- spoilerButton = (
- <div style={spoilerButtonStyle} >
- <IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleOpen} />
- </div>
- );
- }
return (
<div style={{ ...outerStyle, height: `${this.props.height}px` }}>
- {spoilerButton}
+ <div style={spoilerButtonStyle} >
+ <IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleOpen} />
+ </div>
{children}
</div>
);
diff --git a/app/assets/javascripts/components/components/video_player.jsx b/app/assets/javascripts/components/components/video_player.jsx
@@ -4,7 +4,8 @@ import IconButton from './icon_button';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
const messages = defineMessages({
- toggle_sound: { id: 'video_player.toggle_sound', defaultMessage: 'Toggle sound' }
+ toggle_sound: { id: 'video_player.toggle_sound', defaultMessage: 'Toggle sound' },
+ toggle_visible: { id: 'video_player.toggle_visible', defaultMessage: 'Toggle visibility' }
});
const videoStyle = {
@@ -20,7 +21,7 @@ const videoStyle = {
const muteStyle = {
position: 'absolute',
top: '10px',
- left: '10px',
+ right: '10px',
opacity: '0.8',
zIndex: '5'
};
@@ -35,7 +36,8 @@ const spoilerStyle = {
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
- flexDirection: 'column'
+ flexDirection: 'column',
+ position: 'relative'
};
const spoilerSpanStyle = {
@@ -49,6 +51,13 @@ const spoilerSubSpanStyle = {
fontWeight: '500'
};
+const spoilerButtonStyle = {
+ position: 'absolute',
+ top: '6px',
+ left: '8px',
+ zIndex: '100'
+};
+
const VideoPlayer = React.createClass({
propTypes: {
media: ImmutablePropTypes.map.isRequired,
@@ -66,7 +75,8 @@ const VideoPlayer = React.createClass({
getInitialState () {
return {
- visible: false,
+ visible: !this.props.sensitive,
+ preview: true,
muted: true
};
},
@@ -90,22 +100,49 @@ const VideoPlayer = React.createClass({
},
handleOpen () {
- this.setState({ visible: true });
+ this.setState({ preview: !this.state.preview });
+ },
+
+ handleVisibility () {
+ this.setState({
+ visible: !this.state.visible,
+ preview: true
+ });
},
render () {
const { media, intl, width, height, sensitive } = this.props;
- if (sensitive && !this.state.visible) {
- return (
- <div style={{...spoilerStyle, width: `${width}px`, height: `${height}px` }} onClick={this.handleOpen}>
- <span style={spoilerSpanStyle}><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
- <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
- </div>
- );
- } else if (!sensitive && !this.state.visible) {
+ let spoilerButton = (
+ <div style={spoilerButtonStyle} >
+ <IconButton title={intl.formatMessage(messages.toggle_visible)} icon={this.state.visible ? 'eye' : 'eye-slash'} onClick={this.handleVisibility} />
+ </div>
+ );
+
+ if (!this.state.visible) {
+ if (sensitive) {
+ return (
+ <div style={{...spoilerStyle, width: `${width}px`, height: `${height}px` }} onClick={this.handleVisibility}>
+ {spoilerButton}
+ <span style={spoilerSpanStyle}><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
+ <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
+ </div>
+ );
+ } else {
+ return (
+ <div style={{...spoilerStyle, width: `${width}px`, height: `${height}px` }} onClick={this.handleOpen}>
+ {spoilerButton}
+ <span style={spoilerSpanStyle}><FormattedMessage id='status.media_hidden' defaultMessage='Media hidden' /></span>
+ <span style={spoilerSubSpanStyle}><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
+ </div>
+ );
+ }
+ }
+
+ if (this.state.preview) {
return (
<div style={{ cursor: 'pointer', position: 'relative', marginTop: '8px', width: `${width}px`, height: `${height}px`, background: `url(${media.get('preview_url')}) no-repeat center`, backgroundSize: 'cover' }} onClick={this.handleOpen}>
+ {spoilerButton}
<div style={{ position: 'absolute', top: '50%', left: '50%', fontSize: '36px', transform: 'translate(-50%, -50%)', padding: '5px', borderRadius: '100px', color: 'rgba(255, 255, 255, 0.8)' }}><i className='fa fa-play' /></div>
</div>
);
@@ -113,6 +150,7 @@ const VideoPlayer = React.createClass({
return (
<div style={{ cursor: 'default', marginTop: '8px', overflow: 'hidden', width: `${width}px`, height: `${height}px`, boxSizing: 'border-box', background: '#000', position: 'relative' }}>
+ {spoilerButton}
<div style={muteStyle}><IconButton title={intl.formatMessage(messages.toggle_sound)} icon={this.state.muted ? 'volume-off' : 'volume-up'} onClick={this.handleClick} /></div>
<video src={media.get('url')} autoPlay='true' loop={true} muted={this.state.muted} style={videoStyle} onClick={this.handleVideoClick} />
</div>
