heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Updating the video.js that we use to avoid an XSS attack. Yikes! ;\

Browse Source 
This commit sponsored by Daniel Valentine.  Thank you!
This commit is contained in:
Christopher Allan Webber
2013-09-15 09:46:01 -05:00
parent 1fef79f4f8
commit a7fc4ecf40
16 changed files with 7490 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mediagoblin/templates/mediagoblin/media_displays/video.html
View File

@@ -21,9 +21,26 @@
{% block mediagoblin_head -%}
{{ super() }}
<script type="text/javascript" src="{{
request.staticdirect('/extlib/video-js/video.min.js') }}"></script>
<link href="{{ request.staticdirect('/css/vjs-mg-skin.css') }}"
request.staticdirect('/extlib/video-js/video.js') }}"></script>
{# Sadly commented out till we can get the mediagoblin skin ported over
# to the newest video.js release ;\ #}
{#
<link href="{{ request.staticdirect('/css/vjs-mg-skin.css') }}"
rel="stylesheet">
#}
<link href="{{
request.staticdirect('/extlib/video-js/video-js.css') }}"
rel="stylesheet">
<style type="text/css">
.vjs-default-skin .vjs-big-play-button
{
top: 50%;
left: 50%;
margin: -1.5em auto auto -2em;
}
.vjs-play-progress, .vjs-volume-level { background-color: #561792 !important; }
</style>
{%- endblock %}
{% block mediagoblin_media %}
@@ -31,7 +48,7 @@
<video controls
{% if global_config['plugins']['mediagoblin.media_types.video']['auto_play'] %}autoplay{% endif %}
preload="auto" class="video-js vjs-mg-skin"
preload="auto" class="video-js vjs-default-skin"
data-setup='{"height": {{ media.media_data.height }},
"width": {{ media.media_data.width }} }'>
<source src="{{ request.app.public_store.file_url(display_path) }}"