const ExtendedVideoPlayer = React.createClass({
propTypes: {
- src: React.PropTypes.string.isRequired
+ src: React.PropTypes.string.isRequired,
+ controls: React.PropTypes.bool.isRequired,
+ muted: React.PropTypes.bool.isRequired
},
mixins: [PureRenderMixin],
render () {
return (
<div>
- <video src={this.props.src} autoPlay muted loop />
+ <video src={this.props.src} autoPlay muted={this.props.muted} controls={this.props.controls} loop />
</div>
);
},
onReblog: React.PropTypes.func,
onDelete: React.PropTypes.func,
onOpenMedia: React.PropTypes.func,
+ onOpenVideo: React.PropTypes.func,
onBlock: React.PropTypes.func,
me: React.PropTypes.number,
boostModal: React.PropTypes.bool,
if (status.get('media_attachments').size > 0 && !this.props.muted) {
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
- media = <VideoPlayer media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} />;
+ media = <VideoPlayer media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} onOpenVideo={this.props.onOpenVideo} />;
} else {
media = <MediaGallery media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} />;
}
const messages = defineMessages({
toggle_sound: { id: 'video_player.toggle_sound', defaultMessage: 'Toggle sound' },
- toggle_visible: { id: 'video_player.toggle_visible', defaultMessage: 'Toggle visibility' }
+ toggle_visible: { id: 'video_player.toggle_visible', defaultMessage: 'Toggle visibility' },
+ expand_video: { id: 'video_player.expand', defaultMessage: 'Expand video' }
});
const videoStyle = {
zIndex: '100'
};
+const expandButtonStyle = {
+ position: 'absolute',
+ bottom: '6px',
+ right: '8px',
+ color: 'white',
+ textShadow: "0px 1px 1px black, 1px 0px 1px black",
+ zIndex: '100'
+};
+
const VideoPlayer = React.createClass({
propTypes: {
media: ImmutablePropTypes.map.isRequired,
height: React.PropTypes.number,
sensitive: React.PropTypes.bool,
intl: React.PropTypes.object.isRequired,
- autoplay: React.PropTypes.bool
+ autoplay: React.PropTypes.bool,
+ onOpenVideo: React.PropTypes.func.isRequired
},
getDefaultProps () {
});
},
+ handleExpand () {
+ const node = ReactDOM.findDOMNode(this).querySelector('video');
+ node.pause();
+
+ this.props.onOpenVideo(this.props.media);
+ },
+
setRef (c) {
this.video = c;
},
</div>
);
+ let expandButton = (
+ <div style={expandButtonStyle} >
+ <IconButton title={intl.formatMessage(messages.expand_video)} icon='expand' onClick={this.handleExpand} />
+ </div>
+ );
+
let muteButton = '';
if (this.state.hasAudio) {
<div style={{ cursor: 'default', marginTop: '8px', overflow: 'hidden', width: `${width}px`, height: `${height}px`, boxSizing: 'border-box', background: '#000', position: 'relative' }}>
{spoilerButton}
{muteButton}
+ {expandButton}
<video ref={this.setRef} src={media.get('url')} autoPlay={!isIOS()} loop={true} muted={this.state.muted} style={videoStyle} onClick={this.handleVideoClick} />
</div>
);
dispatch(openModal('MEDIA', { media, index }));
},
+ onOpenVideo (media) {
+ dispatch(openModal('VIDEO', { media }));
+ },
+
onBlock (account) {
dispatch(blockAccount(account.get('id')));
},
propTypes: {
status: ImmutablePropTypes.map.isRequired,
- onOpenMedia: React.PropTypes.func.isRequired
+ onOpenMedia: React.PropTypes.func.isRequired,
+ onOpenVideo: React.PropTypes.func.isRequired,
},
mixins: [PureRenderMixin],
if (status.get('media_attachments').size > 0) {
if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
- media = <VideoPlayer sensitive={status.get('sensitive')} media={status.getIn(['media_attachments', 0])} width={300} height={150} autoplay />;
+ media = <VideoPlayer sensitive={status.get('sensitive')} media={status.getIn(['media_attachments', 0])} width={300} height={150} onOpenVideo={this.props.onOpenVideo} autoplay />;
} else {
media = <MediaGallery sensitive={status.get('sensitive')} media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} />;
}
this.props.dispatch(openModal('MEDIA', { media, index }));
},
+ handleOpenVideo (media) {
+ this.props.dispatch(openModal('VIDEO', { media }));
+ },
+
handleReport (status) {
this.props.dispatch(initReport(status.get('account'), status));
},
<div className='scrollable'>
{ancestors}
- <DetailedStatus status={status} me={me} onOpenMedia={this.handleOpenMedia} />
+ <DetailedStatus status={status} me={me} onOpenVideo={this.handleOpenVideo} onOpenMedia={this.handleOpenMedia} />
<ActionBar status={status} me={me} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} onDelete={this.handleDeleteClick} onMention={this.handleMentionClick} onReport={this.handleReport} />
{descendants}
if (attachment.get('type') === 'image') {
content = <ImageLoader src={url} imgProps={{ style: { display: 'block' } }} />;
} else if (attachment.get('type') === 'gifv') {
- content = <ExtendedVideoPlayer src={url} />;
+ content = <ExtendedVideoPlayer src={url} muted={true} controls={false} />;
}
return (
import PureRenderMixin from 'react-addons-pure-render-mixin';
import MediaModal from './media_modal';
+import VideoModal from './video_modal';
import BoostModal from './boost_modal';
import { TransitionMotion, spring } from 'react-motion';
const MODAL_COMPONENTS = {
'MEDIA': MediaModal,
+ 'VIDEO': VideoModal,
'BOOST': BoostModal
};
--- /dev/null
+import LoadingIndicator from '../../../components/loading_indicator';
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ExtendedVideoPlayer from '../../../components/extended_video_player';
+import { defineMessages, injectIntl } from 'react-intl';
+import IconButton from '../../../components/icon_button';
+
+const messages = defineMessages({
+ close: { id: 'lightbox.close', defaultMessage: 'Close' }
+});
+
+const closeStyle = {
+ position: 'absolute',
+ zIndex: '100',
+ top: '4px',
+ right: '4px'
+};
+
+const VideoModal = React.createClass({
+
+ propTypes: {
+ media: ImmutablePropTypes.map.isRequired,
+ onClose: React.PropTypes.func.isRequired,
+ intl: React.PropTypes.object.isRequired
+ },
+
+ mixins: [PureRenderMixin],
+
+ render () {
+ const { media, intl, onClose } = this.props;
+
+ const url = media.get('url');
+
+ return (
+ <div className='modal-root__modal media-modal'>
+ <div>
+ <IconButton title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} style={closeStyle} />
+ <ExtendedVideoPlayer src={url} muted={false} controls={true} />
+ </div>
+ </div>
+ );
+ }
+
+});
+
+export default injectIntl(VideoModal);
"upload_progress.label": "Uploading...",
"video_player.toggle_sound": "Toggle sound",
"video_player.toggle_visible": "Toggle visibility",
+ "video_player.expand": "Expand video",
};
export default en;
cat aescling's git repositories / mastodon.git / commitdiff