Merge remote-tracking branch 'joar/media-fixes'

This commit is contained in:
Joar Wandborg
2012-04-09 20:36:50 +02:00
8 changed files with 87 additions and 46 deletions

View File

@@ -80,5 +80,5 @@
transition: opacity .1s ease-in-out;
}
.audio-spectrogram:hover .audio-volume {
opacity: 1;
opacity: 0.7;
}

View File

@@ -210,8 +210,14 @@ 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());
$('<input placeholder="Range input not supported" class="audio-volume"'
+'type="range" min="0" max="1" step="0.01" />').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());
}
$('.audio-spectrogram').trigger('attachedControls');
};
})(audioPlayer);