@gkatsev checked muted status when updating volume bar level. closes #…

…3037
videojs · Jan 26, 2016 · 8a17313 · 8a17313
1 parent 6317395
commit 8a17313
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ CHANGELOG
 * @OwenEdwards Fixed volume menu keyboard access ([view](https://github.com/videojs/video.js/pull/3034))
 * @mister-ben made $primary-foreground-color a !default sass var ([view](https://github.com/videojs/video.js/pull/3003))
 * @OwenEdwards fixed double-localization of mute toggle control text ([view](https://github.com/videojs/video.js/pull/3017))
+* @gkatsev checked muted status when updating volume bar level ([view](https://github.com/videojs/video.js/pull/3037))
 
 --------------------
 

diff --git a/src/js/control-bar/volume-control/volume-bar.js b/src/js/control-bar/volume-control/volume-bar.js
@@ -44,11 +44,14 @@ class VolumeBar extends Slider {
    * @method handleMouseMove
    */
   handleMouseMove(event) {
+    this.checkMuted();
+    this.player_.volume(this.calculateDistance(event));
+  }
+
+  checkMuted() {
     if (this.player_.muted()) {
       this.player_.muted(false);
     }
-
-    this.player_.volume(this.calculateDistance(event));
   }
 
   /**
@@ -71,6 +74,7 @@ class VolumeBar extends Slider {
    * @method stepForward
    */
   stepForward() {
+    this.checkMuted();
     this.player_.volume(this.player_.volume() + 0.1);
   }
 
@@ -80,6 +84,7 @@ class VolumeBar extends Slider {
    * @method stepBack
    */
   stepBack() {
+    this.checkMuted();
     this.player_.volume(this.player_.volume() - 0.1);
   }