diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-18 07:53:53 -0500 |
commit | 5d823ee00a5c4e06aec457783499ce0f82558bed (patch) | |
tree | bb0bbc474132e71b9f7fb0ccaaac46132dbaa806 /app/javascript/flavours/glitch/features/ui/components/media_modal.js | |
parent | 2636a23092306bdb07250add02d2851476d58bc2 (diff) | |
parent | 07baa1ddb59356bf42fff8e61fe104cf0af79bad (diff) |
Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes
Port public UI changes from upstream
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/media_modal.js')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/media_modal.js | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/media_modal.js b/app/javascript/flavours/glitch/features/ui/components/media_modal.js index 6ab6770ed..bffe3b1f7 100644 --- a/app/javascript/flavours/glitch/features/ui/components/media_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/media_modal.js @@ -2,6 +2,7 @@ import React from 'react'; import ReactSwipeableViews from 'react-swipeable-views'; import ImmutablePropTypes from 'react-immutable-proptypes'; import PropTypes from 'prop-types'; +import Video from 'flavours/glitch/features/video'; import ExtendedVideoPlayer from 'flavours/glitch/components/extended_video_player'; import classNames from 'classnames'; import { defineMessages, injectIntl } from 'react-intl'; @@ -112,6 +113,22 @@ export default class MediaModal extends ImmutablePureComponent { onClick={this.toggleNavigation} /> ); + } else if (image.get('type') === 'video') { + const { time } = this.props; + + return ( + <Video + preview={image.get('preview_url')} + src={image.get('url')} + width={image.get('width')} + height={image.get('height')} + startTime={time || 0} + onCloseVideo={onClose} + detailed + description={image.get('description')} + key={image.get('url')} + /> + ); } else if (image.get('type') === 'gifv') { return ( <ExtendedVideoPlayer |