Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Open video modal on public UI (#7469)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2018-05-13 20:48:14 +09:00 • committed by Eugen Rochko
parent f77b11cd10
commit d9b2f84c92
6 changed files with 68 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/javascript/mastodon/features/ui/components/media_modal.js
View file

@ -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 '../../video';
import ExtendedVideoPlayer from '../../../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