diff --git a/app/assets/javascripts/components/components/extended_video_player.jsx b/app/assets/javascripts/components/components/extended_video_player.jsx index 66e5dee16de..603f005f9b6 100644 --- a/app/assets/javascripts/components/components/extended_video_player.jsx +++ b/app/assets/javascripts/components/components/extended_video_player.jsx @@ -3,7 +3,9 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; 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], @@ -11,7 +13,7 @@ const ExtendedVideoPlayer = React.createClass({ render () { return (
-
); }, diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index c4d5f829bcf..d2d2aaf2001 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -25,6 +25,7 @@ const Status = React.createClass({ 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, @@ -76,7 +77,7 @@ const Status = React.createClass({ if (status.get('media_attachments').size > 0 && !this.props.muted) { if (status.getIn(['media_attachments', 0, 'type']) === 'video') { - media = ; + media = ; } else { media = ; } diff --git a/app/assets/javascripts/components/components/video_player.jsx b/app/assets/javascripts/components/components/video_player.jsx index ab21ca9cd7e..f019664cf0e 100644 --- a/app/assets/javascripts/components/components/video_player.jsx +++ b/app/assets/javascripts/components/components/video_player.jsx @@ -6,7 +6,8 @@ import { isIOS } from '../is_mobile'; 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 = { @@ -61,6 +62,15 @@ const spoilerButtonStyle = { 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, @@ -68,7 +78,8 @@ const VideoPlayer = React.createClass({ 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 () { @@ -116,6 +127,13 @@ const VideoPlayer = React.createClass({ }); }, + handleExpand () { + const node = ReactDOM.findDOMNode(this).querySelector('video'); + node.pause(); + + this.props.onOpenVideo(this.props.media); + }, + setRef (c) { this.video = c; }, @@ -159,6 +177,12 @@ const VideoPlayer = React.createClass({ ); + let expandButton = ( +
+ +
+ ); + let muteButton = ''; if (this.state.hasAudio) { @@ -202,6 +226,7 @@ const VideoPlayer = React.createClass({
{spoilerButton} {muteButton} + {expandButton}
); diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx index fedf80fbf48..d68acd96a76 100644 --- a/app/assets/javascripts/components/containers/status_container.jsx +++ b/app/assets/javascripts/components/containers/status_container.jsx @@ -75,6 +75,10 @@ const mapDispatchToProps = (dispatch) => ({ dispatch(openModal('MEDIA', { media, index })); }, + onOpenVideo (media) { + dispatch(openModal('VIDEO', { media })); + }, + onBlock (account) { dispatch(blockAccount(account.get('id'))); }, diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx index 2da57252ee2..ceafc1a32a2 100644 --- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx +++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx @@ -17,7 +17,8 @@ const DetailedStatus = React.createClass({ propTypes: { status: ImmutablePropTypes.map.isRequired, - onOpenMedia: React.PropTypes.func.isRequired + onOpenMedia: React.PropTypes.func.isRequired, + onOpenVideo: React.PropTypes.func.isRequired, }, mixins: [PureRenderMixin], @@ -39,7 +40,7 @@ const DetailedStatus = React.createClass({ if (status.get('media_attachments').size > 0) { if (status.getIn(['media_attachments', 0, 'type']) === 'video') { - media = ; + media = ; } else { media = ; } diff --git a/app/assets/javascripts/components/features/status/index.jsx b/app/assets/javascripts/components/features/status/index.jsx index 48fea658dd4..b30d991e4db 100644 --- a/app/assets/javascripts/components/features/status/index.jsx +++ b/app/assets/javascripts/components/features/status/index.jsx @@ -112,6 +112,10 @@ const Status = React.createClass({ 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)); }, @@ -151,7 +155,7 @@ const Status = React.createClass({
{ancestors} - + {descendants} diff --git a/app/assets/javascripts/components/features/ui/components/media_modal.jsx b/app/assets/javascripts/components/features/ui/components/media_modal.jsx index 35eb2cb0cdf..130f48b46d5 100644 --- a/app/assets/javascripts/components/features/ui/components/media_modal.jsx +++ b/app/assets/javascripts/components/features/ui/components/media_modal.jsx @@ -111,7 +111,7 @@ const MediaModal = React.createClass({ if (attachment.get('type') === 'image') { content = ; } else if (attachment.get('type') === 'gifv') { - content = ; + content = ; } return ( diff --git a/app/assets/javascripts/components/features/ui/components/modal_root.jsx b/app/assets/javascripts/components/features/ui/components/modal_root.jsx index e7ac02dde64..74eb500397b 100644 --- a/app/assets/javascripts/components/features/ui/components/modal_root.jsx +++ b/app/assets/javascripts/components/features/ui/components/modal_root.jsx @@ -1,10 +1,12 @@ 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 }; diff --git a/app/assets/javascripts/components/features/ui/components/video_modal.jsx b/app/assets/javascripts/components/features/ui/components/video_modal.jsx new file mode 100644 index 00000000000..fa222d7aaf4 --- /dev/null +++ b/app/assets/javascripts/components/features/ui/components/video_modal.jsx @@ -0,0 +1,46 @@ +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 ( +
+
+ + +
+
+ ); + } + +}); + +export default injectIntl(VideoModal); diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 740caef9d05..b0403e33eb3 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -125,6 +125,7 @@ const en = { "upload_progress.label": "Uploading...", "video_player.toggle_sound": "Toggle sound", "video_player.toggle_visible": "Toggle visibility", + "video_player.expand": "Expand video", }; export default en;