From 543ce8b4bea6f432ae26846d2f1de8b5f330df83 Mon Sep 17 00:00:00 2001 From: nickago Date: Sat, 12 Sep 2015 18:07:04 -0700 Subject: WIP Added base video player --- web/react/components/view_image.jsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index b0eaba5d6..8d3495e3b 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -105,6 +105,14 @@ export default class ViewImageModal extends React.Component { this.loadImage(this.state.imgId); }.bind(this)); + $('#' + this.props.modalId).on('hidden.bs.modal', function onModalHide() { + if (this.refs.video) { + var video = React.findDOMNode(this.refs.video); + video.pause(); + video.currentTime = 0; + } + }.bind(this)); + $(React.findDOMNode(this.refs.modal)).click(function onModalClick(e) { if (e.target === this || e.target === React.findDOMNode(this.refs.imageBody)) { $('.image_modal').modal('hide'); @@ -211,6 +219,16 @@ export default class ViewImageModal extends React.Component { /> ); + } else if (fileType === 'video' || fileType === 'audio') { + content = ( + + ); } else { // non-image files include a section providing details about the file var infoString = 'File type ' + fileInfo.ext.toUpperCase(); -- cgit v1.2.3-1-g7c22