From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 23 Mar 2015 22:07:13 +0000 (+0100)
Subject: unload videojs
X-Git-Tag: 1.6a^2~40
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b2c8efc4ce7eb2267f9525d653d17ae9eaa2d937;p=telemeta.git

unload videojs
---

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 7dab0e42..03af98e6 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -163,12 +163,12 @@
 
     {% if "video" in mime_type %}
     <div>
-    <video id="my_video_1" class="video-js vjs-default-skin" width="348" height="240" controls preload="auto" data-setup="{}">
-        <!-- Hello Chrome and Firefox (and Opera?) -->
+    <video width="348" height="240" controls preload="none">
         <source src="{% url "telemeta-item-export" item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
-        </video>
-        <!--<div id="videotime"></div>-->
+    </video>
+    <!--<div id="videotime"></div>-->
     </div>
+
     <script>
     (function(){
         var v = document.getElementsByTagName('video')[0]
@@ -178,6 +178,7 @@
             },false);
             })();
     </script>
+
     {% endif %}
 
         <!-- </div> -->
diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index f2196bc9..bc3c9cc1 100644
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -256,7 +256,6 @@ class ItemView(ItemBaseMixin):
         #FIXME: MP4 handling in TimeSide
         if 'mp4' in extension:
             mime_type = 'video/mp4'
-            print 'ok'
             video = item.file.path
             response = StreamingHttpResponse(stream_from_file(video), mimetype = mime_type)
             response['Content-Disposition'] = 'attachment'