Add content spoilers for media in sensitive-content statuses
This commit is contained in:
parent
0603971894
commit
5434ad3002
3 changed files with 144 additions and 61 deletions
|
@ -1,9 +1,43 @@
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
|
||||||
|
const outerStyle = {
|
||||||
|
marginTop: '8px',
|
||||||
|
overflow: 'hidden',
|
||||||
|
width: '100%',
|
||||||
|
boxSizing: 'border-box'
|
||||||
|
};
|
||||||
|
|
||||||
|
const spoilerStyle = {
|
||||||
|
background: '#000',
|
||||||
|
color: '#fff',
|
||||||
|
textAlign: 'center',
|
||||||
|
height: '100%',
|
||||||
|
cursor: 'pointer'
|
||||||
|
};
|
||||||
|
|
||||||
|
const spoilerSpanStyle = {
|
||||||
|
display: 'block',
|
||||||
|
fontSize: '14px',
|
||||||
|
paddingTop: '45%'
|
||||||
|
};
|
||||||
|
|
||||||
|
const spoilerSubSpanStyle = {
|
||||||
|
fontSize: '11px',
|
||||||
|
fontWeight: '500'
|
||||||
|
};
|
||||||
|
|
||||||
const MediaGallery = React.createClass({
|
const MediaGallery = React.createClass({
|
||||||
|
|
||||||
|
getInitialState () {
|
||||||
|
return {
|
||||||
|
visible: false
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
|
sensitive: React.PropTypes.bool,
|
||||||
media: ImmutablePropTypes.list.isRequired,
|
media: ImmutablePropTypes.list.isRequired,
|
||||||
height: React.PropTypes.number.isRequired,
|
height: React.PropTypes.number.isRequired,
|
||||||
onOpenMedia: React.PropTypes.func.isRequired
|
onOpenMedia: React.PropTypes.func.isRequired
|
||||||
|
@ -20,11 +54,26 @@ const MediaGallery = React.createClass({
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
},
|
},
|
||||||
|
|
||||||
render () {
|
handleOpen () {
|
||||||
var children = this.props.media.take(4);
|
this.setState({ visible: true });
|
||||||
var size = children.size;
|
},
|
||||||
|
|
||||||
children = children.map((attachment, i) => {
|
render () {
|
||||||
|
const { media, sensitive } = this.props;
|
||||||
|
|
||||||
|
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>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
const size = media.take(4).size;
|
||||||
|
|
||||||
|
children = media.take(4).map((attachment, i) => {
|
||||||
let width = 50;
|
let width = 50;
|
||||||
let height = 100;
|
let height = 100;
|
||||||
let top = 'auto';
|
let top = 'auto';
|
||||||
|
@ -80,9 +129,10 @@ const MediaGallery = React.createClass({
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{ marginTop: '8px', overflow: 'hidden', width: '100%', height: `${this.props.height}px`, boxSizing: 'border-box' }}>
|
<div style={{ ...outerStyle, height: `${this.props.height}px` }}>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
|
@ -83,9 +83,9 @@ const Status = React.createClass({
|
||||||
|
|
||||||
if (status.get('media_attachments').size > 0) {
|
if (status.get('media_attachments').size > 0) {
|
||||||
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
|
||||||
media = <VideoPlayer media={status.getIn(['media_attachments', 0])} />;
|
media = <VideoPlayer media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} />;
|
||||||
} else {
|
} else {
|
||||||
media = <MediaGallery media={status.get('media_attachments')} height={110} onOpenMedia={this.props.onOpenMedia} />;
|
media = <MediaGallery media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||||
import IconButton from './icon_button';
|
import IconButton from './icon_button';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
|
||||||
|
|
||||||
const messages = defineMessages({
|
const messages = defineMessages({
|
||||||
toggle_sound: { id: 'video_player.toggle_sound', defaultMessage: 'Toggle sound' }
|
toggle_sound: { id: 'video_player.toggle_sound', defaultMessage: 'Toggle sound' }
|
||||||
|
@ -25,6 +25,25 @@ const muteStyle = {
|
||||||
zIndex: '5'
|
zIndex: '5'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const spoilerStyle = {
|
||||||
|
background: '#000',
|
||||||
|
color: '#fff',
|
||||||
|
textAlign: 'center',
|
||||||
|
height: '100%',
|
||||||
|
cursor: 'pointer'
|
||||||
|
};
|
||||||
|
|
||||||
|
const spoilerSpanStyle = {
|
||||||
|
display: 'block',
|
||||||
|
fontSize: '14px',
|
||||||
|
paddingTop: '45%'
|
||||||
|
};
|
||||||
|
|
||||||
|
const spoilerSubSpanStyle = {
|
||||||
|
fontSize: '11px',
|
||||||
|
fontWeight: '500'
|
||||||
|
};
|
||||||
|
|
||||||
const VideoPlayer = React.createClass({
|
const VideoPlayer = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
media: ImmutablePropTypes.map.isRequired,
|
media: ImmutablePropTypes.map.isRequired,
|
||||||
|
@ -41,6 +60,7 @@ const VideoPlayer = React.createClass({
|
||||||
|
|
||||||
getInitialState () {
|
getInitialState () {
|
||||||
return {
|
return {
|
||||||
|
visible: false,
|
||||||
muted: true
|
muted: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -63,8 +83,21 @@ const VideoPlayer = React.createClass({
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
handleOpen () {
|
||||||
|
this.setState({ visible: true });
|
||||||
|
},
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { media, intl, width, height } = this.props;
|
const { media, intl, width, height, sensitive } = this.props;
|
||||||
|
|
||||||
|
if (sensitive && !this.state.visible) {
|
||||||
|
return (
|
||||||
|
<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>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{ cursor: 'default', marginTop: '8px', overflow: 'hidden', width: `${width}px`, height: `${height}px`, boxSizing: 'border-box', background: '#000', position: 'relative' }}>
|
<div style={{ cursor: 'default', marginTop: '8px', overflow: 'hidden', width: `${width}px`, height: `${height}px`, boxSizing: 'border-box', background: '#000', position: 'relative' }}>
|
||||||
|
|
Loading…
Reference in a new issue