From d5957da3b282166c882c5d81e64936dec118ecf6 Mon Sep 17 00:00:00 2001 From: David LaPalomento Date: Mon, 31 Mar 2014 16:22:43 -0400 Subject: [PATCH] Peg the volume control to 1.0 on init Setup styles so that the volume control initially renders at full volume. This matches browser behavior where volume is available and saves Javascript from having to manually update the volume control on init. After the initial draw, the volume control is updated dynamically the same way it was before. --- src/css/video-js.less | 5 +++++ src/js/control-bar/volume-control.js | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/css/video-js.less b/src/css/video-js.less index 622d43dbf0..7d7d9baaca 100644 --- a/src/css/video-js.less +++ b/src/css/video-js.less @@ -303,6 +303,7 @@ fonts to show/hide properly. top: 0; left: 0; height: 0.5em; + width: 100%; background: @slider-bar-color url(@slider-bar-pattern) @@ -311,6 +312,10 @@ fonts to show/hide properly. .vjs-default-skin .vjs-volume-bar .vjs-volume-handle { width: 0.5em; height: 0.5em; + /* Assumes volume starts at 1.0. If you change the size of the + handle relative to the volume bar, you'll need to update this value + too. */ + left: 90%; } .vjs-default-skin .vjs-volume-handle:before { diff --git a/src/js/control-bar/volume-control.js b/src/js/control-bar/volume-control.js index 14089d97dc..64ec52d247 100644 --- a/src/js/control-bar/volume-control.js +++ b/src/js/control-bar/volume-control.js @@ -49,7 +49,6 @@ vjs.VolumeBar = vjs.Slider.extend({ vjs.Slider.call(this, player, options); player.on('volumechange', vjs.bind(this, this.updateARIAAttributes)); player.ready(vjs.bind(this, this.updateARIAAttributes)); - setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM } });