fix(UI): Allow play/pause when seekOnTaps is enabled (#8206)

Fixes #8199
shaka-project · Mar 4, 2025 · db43a18 · db43a18
1 parent 051da08
commit db43a18
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 21 deletions.
diff --git a/ui/controls.js b/ui/controls.js
@@ -867,6 +867,13 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       return;
     }
 
+    if (this.ad_) {
+      this.playPauseAd();
+      if (this.ad_.isLinear()) {
+        return;
+      }
+    }
+
     if (!this.video_.duration) {
       // Can't play yet.  Ignore.
       return;
@@ -1336,10 +1343,10 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       const keyboardSeekDistance = this.config_.keyboardSeekDistance;
       switch (details.action) {
         case 'pause':
-          this.onPlayPauseClick_();
+          this.playPausePresentation();
           break;
         case 'play':
-          this.onPlayPauseClick_();
+          this.playPausePresentation();
           break;
         case 'seekbackward':
           if (details.seekOffset && !isFinite(details.seekOffset)) {
@@ -1669,19 +1676,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     if (this.anySettingsMenusAreOpen()) {
       this.hideSettingsMenusTimer_.tickNow();
     } else if (this.config_.singleClickForPlayAndPause) {
-      this.onPlayPauseClick_();
-    }
-  }
-
-  /** @private */
-  onPlayPauseClick_() {
-    if (this.ad_) {
-      this.playPauseAd();
-      if (this.ad_.isLinear()) {
-        return;
-      }
+      this.playPausePresentation();
     }
-    this.playPausePresentation();
   }
 
   /** @private */
@@ -1792,7 +1788,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       // Pause or play by pressing space on the seek bar.
       case ' ':
         if (isSeekBar) {
-          this.onPlayPauseClick_();
+          this.playPausePresentation();
         }
         break;
     }

diff --git a/ui/hidden_seek_button.js b/ui/hidden_seek_button.js
@@ -37,7 +37,11 @@ shaka.ui.HiddenSeekButton = class extends shaka.ui.Element {
      * @private {shaka.util.Timer}
      */
     this.hideSeekButtonContainerTimer_ = new shaka.util.Timer(() => {
+      const position = parseInt(this.seekValue_.textContent, 10);
       this.hideSeekButtonContainer_();
+      if (position == 0) {
+        this.controls.playPausePresentation();
+      }
     });
 
     /** @protected {!HTMLElement} */

diff --git a/ui/play_button.js b/ui/play_button.js
@@ -77,12 +77,6 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     });
 
     this.eventManager.listen(this.button, 'click', () => {
-      if (this.ad) {
-        this.controls.playPauseAd();
-        if (this.ad.isLinear()) {
-          return;
-        }
-      }
       this.controls.playPausePresentation();
     });