fix(UI): Fix weird behaviour when volume was 0, and we unmute (#8186)

Fixes #8184
shaka-project · Feb 28, 2025 · 3ff0e28 · 3ff0e28
1 parent 5debddc
commit 3ff0e28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/ui/mute_button.js b/ui/mute_button.js
@@ -75,7 +75,11 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
       if (this.ad && this.ad.isLinear()) {
         this.ad.setMuted(!this.ad.isMuted());
       } else {
-        this.video.muted = !this.video.muted;
+        if (!this.video.muted && this.video.volume == 0) {
+          this.video.volume = 1;
+        } else {
+          this.video.muted = !this.video.muted;
+        }
       }
     });
 
@@ -117,7 +121,8 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
     if (this.ad) {
       label = this.ad.isMuted() ? LocIds.UNMUTE : LocIds.MUTE;
     } else {
-      label = this.video.muted ? LocIds.UNMUTE : LocIds.MUTE;
+      label = (this.video.muted || this.video.volume == 0) ?
+          LocIds.UNMUTE : LocIds.MUTE;
     }
 
     this.button_.ariaLabel = this.localization.resolve(label);
@@ -133,7 +138,8 @@ shaka.ui.MuteButton = class extends shaka.ui.Element {
     if (this.ad) {
       icon = this.ad.isMuted() ? Icons.UNMUTE : Icons.MUTE;
     } else {
-      icon = this.video.muted ? Icons.UNMUTE : Icons.MUTE;
+      icon = (this.video.muted || this.video.volume == 0) ?
+          Icons.UNMUTE : Icons.MUTE;
     }
     this.icon_.textContent = icon;
   }

diff --git a/ui/volume_bar.js b/ui/volume_bar.js
@@ -81,11 +81,6 @@ shaka.ui.VolumeBar = class extends shaka.ui.RangeElement {
       this.ad.setVolume(this.getValue() / 100);
     } else {
       this.video.volume = this.getValue() / 100;
-      if (this.video.volume == 0) {
-        this.video.muted = true;
-      } else {
-        this.video.muted = false;
-      }
     }
   }