aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
diff options
context:
space:
mode:
authorpythonsnake <pythonsnake98@gmail.com>2013-02-10 15:08:15 +0100
committerpythonsnake <pythonsnake98@gmail.com>2013-02-10 15:08:15 +0100
commit6f6471aa5e8e1bcbd6365dc3dd12781743105929 (patch)
tree9351c3ada39d7ab1a67930090585f8a1d40f7961 /mediagoblin/templates
parent591c11609852c5481f00bf0eaa01ceafcd244f38 (diff)
downloadmediagoblin-6f6471aa5e8e1bcbd6365dc3dd12781743105929.tar.lz
mediagoblin-6f6471aa5e8e1bcbd6365dc3dd12781743105929.tar.xz
mediagoblin-6f6471aa5e8e1bcbd6365dc3dd12781743105929.zip
Fix bug 629
Diffstat (limited to 'mediagoblin/templates')
-rw-r--r--mediagoblin/templates/mediagoblin/media_displays/video.html4
1 files changed, 3 insertions, 1 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html
index 7d5ede8d..9eeb7c85 100644
--- a/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@ -27,7 +27,9 @@
{%- endblock %}
{% block mediagoblin_media %}
- <video controls autoplay preload="auto" class="video-js vjs-mg-skin"
+ <video controls
+ {% if global_config['media_type:mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %}
+ preload="auto" class="video-js vjs-mg-skin"
data-setup='{"height": {{ media.media_data.height }},
"width": {{ media.media_data.width }} }'>
<source src="{{ request.app.public_store.file_url(