Merge remote-tracking branch 'joar/html5slider'

This commit is contained in:
Joar Wandborg
2012-04-18 12:10:23 +02:00
4 changed files with 273 additions and 8 deletions

View File

@@ -210,14 +210,8 @@ var audioPlayer = new Object();
$('<div class="seekbar"></div>').appendTo(im.parent());
$('<div class="audio-control-play-pause paused">▶</div>').appendTo(im.parent());
$('<div class="audio-currentTime">00:00</div>').appendTo(im.parent());
if (navigator && /Firefox/.test(navigator.userAgent)) {
$('<p class="message_warning">Sorry, Firefox does not support the '
+ 'range input type, you won\'t be able to change the volume</p>')
.appendTo(im.parent().parent());
} else {
$('<input type="range" class="audio-volume"'
+'value="1" min="0" max="1" step="0.001" />').appendTo(im.parent());
}
$('<input type="range" class="audio-volume"'
+'value="1" min="0" max="1" step="0.001" />').appendTo(im.parent());
$('.audio-spectrogram').trigger('attachedControls');
};
})(audioPlayer);

View File

@@ -0,0 +1 @@
../../../../extlib/html5slider/html5slider.js

View File

@@ -21,6 +21,8 @@
{% block mediagoblin_head %}
{{ super() }}
<link rel="stylesheet" type="text/css" href="{{ request.staticdirect('/css/audio.css') }}" />
<script type="text/javascript" src="{{ request.staticdirect(
'/js/extlib/html5slider.js') }}"></script>
<script type="text/javascript" src="{{ request.staticdirect(
'/js/audio.js') }}"></script>
{% endblock %}