summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornickago <ngonella@calpoly.edu>2015-09-12 18:07:04 -0700
committernickago <ngonella@calpoly.edu>2015-09-12 18:19:17 -0700
commit543ce8b4bea6f432ae26846d2f1de8b5f330df83 (patch)
treea3bc61fca9f91320b441969c6c99e2f12d925a21
parenta9a7efbe9833f4b222b79bcf3aa39dc26eb470ad (diff)
downloadchat-543ce8b4bea6f432ae26846d2f1de8b5f330df83.tar.gz
chat-543ce8b4bea6f432ae26846d2f1de8b5f330df83.tar.bz2
chat-543ce8b4bea6f432ae26846d2f1de8b5f330df83.zip
WIP Added base video player
-rw-r--r--web/react/components/view_image.jsx18
1 files changed, 18 insertions, 0 deletions
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 {
/>
</a>
);
+ } else if (fileType === 'video' || fileType === 'audio') {
+ content = (
+ <video
+ ref='video'
+ data-setup='{}'
+ controls='controls'
+ >
+ <source src={Utils.getWindowLocationOrigin() + '/api/v1/files/get' + filename} />
+ </video>
+ );
} else {
// non-image files include a section providing details about the file
var infoString = 'File type ' + fileInfo.ext.toUpperCase();