aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin')
l---------mediagoblin/static/js/extlib/video-js1
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/video.html10
2 files changed, 9 insertions, 2 deletions
diff --git a/mediagoblin/static/js/extlib/video-js b/mediagoblin/static/js/extlib/video-js
new file mode 120000
index 00000000..35da21ca
--- /dev/null
+++ b/mediagoblin/static/js/extlib/video-js
@@ -0,0 +1 @@
+../../../../extlib/video-js \ No newline at end of file
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index acd570e7..6c2c80e7 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -18,13 +18,19 @@
{% extends 'mediagoblin/user_pages/media.html' %}
+{% block mediagoblin_head %}
+ {{ super() }}
+ <script type="text/javascript"
+ src="{{ request.staticdirect('/js/extlib/video-js/video.js') }}"></script>
+ <link href="{{ request.staticdirect('/js/extlib/video-js/video-js.css') }}" rel="stylesheet">
+{% endblock %}
+
{% block mediagoblin_media %}
<div class="video-player" style="position: relative;">
<video class="video-js vjs-default-skin"
width="{{ media.media_data.width }}"
height="{{ media.media_data.height }}"
- controls="controls"
- preload="auto"
+ controls preload="metadata"
data-setup="">
<source src="{{ request.app.public_store.file_url(
media.media_files['webm_640']) }}"