From 2e565e44343842fb7802adc362ca453a807dc1fb Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Fri, 11 Nov 2016 13:53:47 +0800
Subject: [PATCH] [history/shared file view] modification for video files

---
 seahub/templates/snippets/file_content_js.html | 9 +++++++--
 seahub/templates/snippets/file_view_js.html    | 5 ++++-
 seahub/templates/snippets/file_view_style.html | 6 +++++-
 seahub/utils/__init__.py                       | 2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/seahub/templates/snippets/file_content_js.html b/seahub/templates/snippets/file_content_js.html
index 6ef653ebc3..32868d91ce 100644
--- a/seahub/templates/snippets/file_content_js.html
+++ b/seahub/templates/snippets/file_content_js.html
@@ -139,8 +139,13 @@ try {
 {% endif %}
 
 {% if filetype == 'Video' %}
-      $('#file-view').html('<div class="video-container"><video src="{{raw_path}}" width="800" height="400"></video></div>');
-$('video').mediaelementplayer(/* Options */);
+$('#file-view').html('<div class="video-container"><video id="sf-video" src="{{raw_path}}" width="800" height="400" class="video-js vjs-default-skin"></video></div>');
+videojs.options.flash.swf = "{{MEDIA_URL}}js/video-js.swf";
+videojs('sf-video', {
+    'controls': true,
+    'autoplay': false,
+    'preload': 'auto'
+});
 {% endif %}
 
 {% if filetype == 'Audio' %}
diff --git a/seahub/templates/snippets/file_view_js.html b/seahub/templates/snippets/file_view_js.html
index 8ddf9af814..407904a538 100644
--- a/seahub/templates/snippets/file_view_js.html
+++ b/seahub/templates/snippets/file_view_js.html
@@ -4,9 +4,12 @@
 {% if filetype == 'PDF' and use_pdfjs %}
 <script type="text/javascript" src="{{MEDIA_URL}}js/pdf.js"></script>
 {% endif %}
-{% if filetype == 'Video'  or filetype == 'Audio' %}
+{% if filetype == 'Audio' %}
 <script src="{{MEDIA_URL}}js/mediaelement-and-player.min.js"></script>
 {% endif %}
+{% if filetype == 'Video' %}
+<script src="{{MEDIA_URL}}js/video.min.js"></script>
+{% endif %}
 {% if filetype == 'Markdown' %}
 <script type="text/javascript" src="{{MEDIA_URL}}js/editormd/lib/marked.min.js"></script>
 {% endif %}
diff --git a/seahub/templates/snippets/file_view_style.html b/seahub/templates/snippets/file_view_style.html
index 26be08f8b4..4da983e60e 100644
--- a/seahub/templates/snippets/file_view_style.html
+++ b/seahub/templates/snippets/file_view_style.html
@@ -14,10 +14,14 @@
 </style>
 {% endif %}
 
-{% if filetype == 'Video'  or filetype == 'Audio' %}
+{% if filetype == 'Audio' %}
 <link rel="stylesheet" href="{{MEDIA_URL}}css/mediaelementplayer.css" />
 {% endif %}
 
+{% if filetype == 'Video' %}
+<link rel="stylesheet" href="{{MEDIA_URL}}css/video-js.min.css" />
+{% endif %}
+
 {% if filetype == 'Document' or filetype == 'PDF' and not use_pdfjs %}
     {% include 'snippets/office_convert_style.html' %}
 {% endif %}
diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py
index a749f338ff..b68ad9fad1 100644
--- a/seahub/utils/__init__.py
+++ b/seahub/utils/__init__.py
@@ -102,7 +102,7 @@ PREVIEW_FILEEXT = {
     PDF: ('pdf',),
     OPENDOCUMENT: ('odt', 'fodt', 'odp', 'fodp'),
     MARKDOWN: ('markdown', 'md'),
-    VIDEO: ('mp4', 'ogv', 'webm', 'wmv', 'mov'),
+    VIDEO: ('mp4', 'ogv', 'webm', 'mov'),
     AUDIO: ('mp3', 'oga', 'ogg'),
     '3D': ('stl', 'obj'),
 }