From 7420467fb8fa990d0bb0f46f447f7ed038c9a991 Mon Sep 17 00:00:00 2001
From: Alex Barstow <alexander.barstow@gmail.com>
Date: Tue, 19 Nov 2024 13:22:50 -0500
Subject: [PATCH 1/9] chore(package): Update @videojs/http-streaming to 3.16.0
 (#8921)

## Description
n/a

## Specific Changes proposed
n/a

## Requirements Checklist
- [ ] Feature implemented / Bug fixed
- [ ] If necessary, more likely in a feature request than a bug fix
- [ ] Change has been verified in an actual browser (Chrome, Firefox,
IE)
  - [ ] Unit Tests updated or fixed
  - [ ] Docs/guides updated
- [ ] Example created ([starter template on
JSBin](https://codepen.io/gkatsev/pen/GwZegv?editors=1000#0))
- [ ] Has no DOM changes which impact accessiblilty or trigger warnings
(e.g. Chrome issues tab)
  - [ ] Has no changes to JSDoc which cause `npm run docs:api` to error
- [ ] Reviewed by Two Core Contributors
---
 package-lock.json | 29 ++++++++++++++++++++---------
 package.json      |  2 +-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be4349f005..20201f8686 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1791,9 +1791,9 @@
       }
     },
     "@videojs/http-streaming": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.15.0.tgz",
-      "integrity": "sha512-6rjaqEa87gVFqDFsHaLKXGrDqL3NhNZRNi6wkMw+uyt1lrLD2OFY0SfRQRNl7Vmmx0pt5FRJoRJYlnKsowyElA==",
+      "version": "3.16.0",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.0.tgz",
+      "integrity": "sha512-VL8l+JGbc9KqZ1fY2pYgBS1u3i6iQ/5mRAE6bwrI5R0RAtKxur1hjipVGwkkJSYRzwLgArt5Wg5abEjfoJN7yA==",
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "^4.1.1",
@@ -1801,8 +1801,19 @@
         "global": "^4.4.0",
         "m3u8-parser": "^7.2.0",
         "mpd-parser": "^1.3.1",
-        "mux.js": "7.0.3",
+        "mux.js": "7.1.0",
         "video.js": "^7 || ^8"
+      },
+      "dependencies": {
+        "mux.js": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.1.0.tgz",
+          "integrity": "sha512-NTxawK/BBELJrYsZThEulyUMDVlLizKdxyAsMuzoCD1eFj97BVaA8D/CvKsKu6FOLYkFojN5CbM9h++ZTZtknA==",
+          "requires": {
+            "@babel/runtime": "^7.11.2",
+            "global": "^4.4.0"
+          }
+        }
       }
     },
     "@videojs/vhs-utils": {
@@ -15050,18 +15061,18 @@
       "dev": true
     },
     "video.js": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.18.1.tgz",
-      "integrity": "sha512-oQ4M/HD2fFgEPHfmVMWxGykRFIpOmVhK0XZ4PSsPTgN2jH6E6+92f/RI2mDXDb0yu+Fxv9fxMUm0M7Z2K3Zo9w==",
+      "version": "8.19.1",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.19.1.tgz",
+      "integrity": "sha512-MVuayhXpzTBv5Jk3nYEU2akawPhuBBlizEbpQGx2i+6FiBmqxGjkrkLdDLOzG54ut7xapjp26IfWQLGSpeLmcQ==",
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "^3.14.2",
+        "@videojs/http-streaming": "^3.15.0",
         "@videojs/vhs-utils": "^4.1.1",
         "@videojs/xhr": "2.7.0",
         "aes-decrypter": "^4.0.2",
         "global": "4.4.0",
         "m3u8-parser": "^7.2.0",
-        "mpd-parser": "^1.2.2",
+        "mpd-parser": "^1.3.1",
         "mux.js": "^7.0.1",
         "videojs-contrib-quality-levels": "4.1.0",
         "videojs-font": "4.2.0",
diff --git a/package.json b/package.json
index 960ec679bd..7e79e2aef0 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@videojs/http-streaming": "^3.15.0",
+    "@videojs/http-streaming": "^3.16.0",
     "@videojs/vhs-utils": "^4.1.1",
     "@videojs/xhr": "2.7.0",
     "aes-decrypter": "^4.0.2",

From 62f38446a5f01e85739bdb7207c7e992b57c1c86 Mon Sep 17 00:00:00 2001
From: Alex Barstow <abarstow@brightcove.com>
Date: Tue, 19 Nov 2024 14:39:40 -0500
Subject: [PATCH 2/9] 8.20.0

---
 CHANGELOG.md      |  8 ++++++++
 README.md         | 12 ++++++------
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5245a38f25..b33264d959 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="8.20.0"></a>
+# [8.20.0](https://github.com/videojs/video.js/compare/v8.19.2...v8.20.0) (2024-11-19)
+
+### Chores
+
+* Correct changelog for 8.19.2 ([#8918](https://github.com/videojs/video.js/issues/8918)) ([964c40e](https://github.com/videojs/video.js/commit/964c40e))
+* **package:** Update [@videojs](https://github.com/videojs)/http-streaming to 3.16.0 ([#8921](https://github.com/videojs/video.js/issues/8921)) ([7420467](https://github.com/videojs/video.js/commit/7420467)), closes [1000#0](https://github.com/1000/issues/0)
+
 <a name="8.19.2"></a>
 ## [8.19.2](https://github.com/videojs/video.js/compare/v8.19.1...v8.19.2) (2024-11-14)
 
diff --git a/README.md b/README.md
index eb158e376b..9dcb23c6bf 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
 Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:
 
 ```html
-<link href="//vjs.zencdn.net/8.19.2/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/8.19.2/video.min.js"></script>
+<link href="//vjs.zencdn.net/8.20.0/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/8.20.0/video.min.js"></script>
 ```
 
 Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
@@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
 <script src="https://unpkg.com/video.js/dist/video.min.js"></script>
 
 <!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://unpkg.com/video.js@8.19.2/dist/video-js.min.css" rel="stylesheet">
-<script src="https://unpkg.com/video.js@8.19.2/dist/video.min.js"></script>
+<link href="https://unpkg.com/video.js@8.20.0/dist/video-js.min.css" rel="stylesheet">
+<script src="https://unpkg.com/video.js@8.20.0/dist/video.min.js"></script>
 
 <!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.19.2/video-js.min.css" rel="stylesheet">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.19.2/video.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video-js.min.css" rel="stylesheet">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video.min.js"></script>
 ```
 
 Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!
diff --git a/package-lock.json b/package-lock.json
index 20201f8686..ad7e19f78a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "video.js",
-  "version": "8.19.2",
+  "version": "8.20.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7e79e2aef0..22600b7615 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
-  "version": "8.19.2",
+  "version": "8.20.0",
   "main": "./dist/video.cjs.js",
   "module": "./dist/video.es.js",
   "style": "./dist/video-js.css",

From 57d6ab65ea8dbbb7718c90754f4421918c3b2c28 Mon Sep 17 00:00:00 2001
From: Alex Barstow <alexander.barstow@gmail.com>
Date: Mon, 25 Nov 2024 16:59:10 -0500
Subject: [PATCH 3/9] feat: Add option to disable seeking while scrubbing on
 mobile (#8903)

## Description
On desktop, a user can hover over the progress bar while content plays,
which makes it possible to seek to a relatively precise location without
disrupting playback. On mobile there is no hovering, so in order to seek
during inline playback the user can only tap a location on the progress
bar (very hard to do precisely on a small screen) or scrub to try to
hone in on a specific location (can be very clunky because seeks are
constantly being executed). This PR adds a feature to treat scrubbing on
mobile more like hovering on desktop-- while scrubbing, seeks are
disabled and playback continues, only when the user finishes scrubbing
is a single seek executed to the desired location.

One key use-case for this feature is thumbnail seeking integrations on
mobile, where the user can scrub through different thumbnail images
until they find their desired seek location.

## Specific Changes proposed
This behavior is similar to the existing `enableSmoothSeeking` behavior
in that the `PlayProgressBar` slider visibly updates with the scrubbing
movements, but differs in a few ways:
- Playback continues while scrubbing, no seeks are executed until
`touchend`.
- The seek bar's `TimeTooltip` component displays the target seek time
while scrubbing, rather than the `CurrentTimeDisplay` (which continues
to show the current time of the playing content).
---
 src/css/components/_progress.scss             |  10 +-
 .../progress-control/progress-control.js      |   4 +-
 .../control-bar/progress-control/seek-bar.js  |  50 +++++-
 src/js/player.js                              |   3 +-
 test/unit/controls.test.js                    |  14 ++
 test/unit/player.test.js                      | 148 ++++++++++++++++++
 6 files changed, 216 insertions(+), 13 deletions(-)

diff --git a/src/css/components/_progress.scss b/src/css/components/_progress.scss
index e1c1851009..362901fc97 100644
--- a/src/css/components/_progress.scss
+++ b/src/css/components/_progress.scss
@@ -41,7 +41,8 @@
 
 // This increases the size of the progress holder so there is an increased
 // hit area for clicks/touches.
-.video-js .vjs-progress-control:hover .vjs-progress-holder {
+.video-js .vjs-progress-control:hover .vjs-progress-holder,
+.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-progress-holder {
   font-size: 1.666666666666666666em;
 }
 
@@ -143,7 +144,8 @@
 }
 
 .video-js .vjs-progress-control:hover .vjs-time-tooltip,
-.video-js .vjs-progress-control:hover .vjs-progress-holder:focus .vjs-time-tooltip {
+.video-js .vjs-progress-control:hover .vjs-progress-holder:focus .vjs-time-tooltip,
+.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-time-tooltip {
   display: block;
 
   // Ensure that we maintain a font-size of ~10px.
@@ -172,6 +174,10 @@
   display: block;
 }
 
+.video-js.vjs-scrubbing.vjs-touch-enabled .vjs-progress-control .vjs-mouse-display {
+  display: block;
+}
+
 .video-js.vjs-user-inactive .vjs-progress-control .vjs-mouse-display {
   visibility: hidden;
   opacity: 0;
diff --git a/src/js/control-bar/progress-control/progress-control.js b/src/js/control-bar/progress-control/progress-control.js
index cbff618485..edb39d6920 100644
--- a/src/js/control-bar/progress-control/progress-control.js
+++ b/src/js/control-bar/progress-control/progress-control.js
@@ -141,7 +141,7 @@ class ProgressControl extends Component {
     }
 
     this.off(['mousedown', 'touchstart'], this.handleMouseDownHandler_);
-    this.off(this.el_, 'mousemove', this.handleMouseMove);
+    this.off(this.el_, ['mousemove', 'touchmove'], this.handleMouseMove);
 
     this.removeListenersAddedOnMousedownAndTouchstart();
 
@@ -172,7 +172,7 @@ class ProgressControl extends Component {
     }
 
     this.on(['mousedown', 'touchstart'], this.handleMouseDownHandler_);
-    this.on(this.el_, 'mousemove', this.handleMouseMove);
+    this.on(this.el_, ['mousemove', 'touchmove'], this.handleMouseMove);
     this.removeClass('disabled');
 
     this.enabled_ = true;
diff --git a/src/js/control-bar/progress-control/seek-bar.js b/src/js/control-bar/progress-control/seek-bar.js
index b59a65534f..b078b3d0f0 100644
--- a/src/js/control-bar/progress-control/seek-bar.js
+++ b/src/js/control-bar/progress-control/seek-bar.js
@@ -8,6 +8,7 @@ import * as Dom from '../../utils/dom.js';
 import * as Fn from '../../utils/fn.js';
 import {formatTime} from '../../utils/time.js';
 import {silencePromise} from '../../utils/promise';
+import {merge} from '../../utils/obj';
 import document from 'global/document';
 
 /** @import Player from '../../player' */
@@ -40,7 +41,23 @@ class SeekBar extends Slider {
    *        The key/value store of player options.
    */
   constructor(player, options) {
+    options = merge(SeekBar.prototype.options_, options);
+
+    // Avoid mutating the prototype's `children` array by creating a copy
+    options.children = [...options.children];
+
+    const shouldDisableSeekWhileScrubbingOnMobile = player.options_.disableSeekWhileScrubbingOnMobile && (IS_IOS || IS_ANDROID);
+
+    // Add the TimeTooltip as a child if we are on desktop, or on mobile with `disableSeekWhileScrubbingOnMobile: true`
+    if ((!IS_IOS && !IS_ANDROID) || shouldDisableSeekWhileScrubbingOnMobile) {
+      options.children.splice(1, 0, 'mouseTimeDisplay');
+    }
+
     super(player, options);
+
+    this.shouldDisableSeekWhileScrubbingOnMobile_ = shouldDisableSeekWhileScrubbingOnMobile;
+    this.pendingSeekTime_ = null;
+
     this.setEventHandlers_();
   }
 
@@ -225,6 +242,12 @@ class SeekBar extends Slider {
    *         The percentage of media played so far (0 to 1).
    */
   getPercent() {
+    // If we have a pending seek time, we are scrubbing on mobile and should set the slider percent
+    // to reflect the current scrub location.
+    if (this.pendingSeekTime_) {
+      return this.pendingSeekTime_ / this.player_.duration();
+    }
+
     const currentTime = this.getCurrentTime_();
     let percent;
     const liveTracker = this.player_.liveTracker;
@@ -260,7 +283,12 @@ class SeekBar extends Slider {
     event.stopPropagation();
 
     this.videoWasPlaying = !this.player_.paused();
-    this.player_.pause();
+
+    // Don't pause if we are on mobile and `disableSeekWhileScrubbingOnMobile: true`.
+    // In that case, playback should continue while the player scrubs to a new location.
+    if (!this.shouldDisableSeekWhileScrubbingOnMobile_) {
+      this.player_.pause();
+    }
 
     super.handleMouseDown(event);
   }
@@ -324,8 +352,12 @@ class SeekBar extends Slider {
       }
     }
 
-    // Set new time (tell player to seek to new time)
-    this.userSeek_(newTime);
+    // if on mobile and `disableSeekWhileScrubbingOnMobile: true`, keep track of the desired seek point but we won't initiate the seek until 'touchend'
+    if (this.shouldDisableSeekWhileScrubbingOnMobile_) {
+      this.pendingSeekTime_ = newTime;
+    } else {
+      this.userSeek_(newTime);
+    }
 
     if (this.player_.options_.enableSmoothSeeking) {
       this.update();
@@ -371,6 +403,13 @@ class SeekBar extends Slider {
     }
     this.player_.scrubbing(false);
 
+    // If we have a pending seek time, then we have finished scrubbing on mobile and should initiate a seek.
+    if (this.pendingSeekTime_) {
+      this.userSeek_(this.pendingSeekTime_);
+
+      this.pendingSeekTime_ = null;
+    }
+
     /**
      * Trigger timeupdate because we're done seeking and the time has changed.
      * This is particularly useful for if the player is paused to time the time displays.
@@ -513,10 +552,5 @@ SeekBar.prototype.options_ = {
   barName: 'playProgressBar'
 };
 
-// MouseTimeDisplay tooltips should not be added to a player on mobile devices
-if (!IS_IOS && !IS_ANDROID) {
-  SeekBar.prototype.options_.children.splice(1, 0, 'mouseTimeDisplay');
-}
-
 Component.registerComponent('SeekBar', SeekBar);
 export default SeekBar;
diff --git a/src/js/player.js b/src/js/player.js
index f5f3d22ed4..95349cdfdd 100644
--- a/src/js/player.js
+++ b/src/js/player.js
@@ -5567,7 +5567,8 @@ Player.prototype.options_ = {
     horizontalSeek: false
   },
   // Default smooth seeking to false
-  enableSmoothSeeking: false
+  enableSmoothSeeking: false,
+  disableSeekWhileScrubbingOnMobile: false
 };
 
 TECH_EVENTS_RETRIGGER.forEach(function(event) {
diff --git a/test/unit/controls.test.js b/test/unit/controls.test.js
index fcbc0be3e3..0a05551268 100644
--- a/test/unit/controls.test.js
+++ b/test/unit/controls.test.js
@@ -223,6 +223,20 @@ QUnit.test('SeekBar should be filled on 100% when the video/audio ends', functio
   window.cancelAnimationFrame = oldCAF;
 });
 
+QUnit.test('Seek bar percent should represent scrub location if we are scrubbing on mobile and have a pending seek time', function(assert) {
+  const player = TestHelpers.makePlayer();
+  const seekBar = player.controlBar.progressControl.seekBar;
+
+  player.duration(100);
+  seekBar.pendingSeekTime_ = 20;
+
+  assert.equal(seekBar.getPercent(), 0.2, 'seek bar percent set correctly to pending seek time');
+
+  seekBar.pendingSeekTime_ = 50;
+
+  assert.equal(seekBar.getPercent(), 0.5, 'seek bar percent set correctly to next pending seek time');
+});
+
 QUnit.test('playback rate button is hidden by default', function(assert) {
   assert.expect(1);
 
diff --git a/test/unit/player.test.js b/test/unit/player.test.js
index 4e6cbfa286..4608508808 100644
--- a/test/unit/player.test.js
+++ b/test/unit/player.test.js
@@ -3611,6 +3611,154 @@ QUnit.test('smooth seeking set to true should update the display time components
   player.dispose();
 });
 
+QUnit.test('mouseTimeDisplay should be added as child when disableSeekWhileScrubbingOnMobile is true on mobile', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: true });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const mouseTimeDisplay = seekBar.getChild('mouseTimeDisplay');
+
+  assert.ok(mouseTimeDisplay, 'mouseTimeDisplay added as a child');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('mouseTimeDisplay should not be added as child on mobile when disableSeekWhileScrubbingOnMobile is false', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: false });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const mouseTimeDisplay = seekBar.getChild('mouseTimeDisplay');
+
+  assert.notOk(mouseTimeDisplay, 'mouseTimeDisplay not added as a child');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('Seeking should occur while scrubbing on mobile when disableSeekWhileScrubbingOnMobile is false', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: false });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const userSeekSpy = sinon.spy(seekBar, 'userSeek_');
+
+  // Simulate a source loaded
+  player.duration(10);
+
+  // Simulate scrub
+  seekBar.handleMouseMove({ pageX: 200 });
+
+  assert.ok(userSeekSpy.calledOnce, 'Seek initiated while scrubbing');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('Seeking should not occur while scrubbing on mobile when disableSeekWhileScrubbingOnMobile is true', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: true });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const userSeekSpy = sinon.spy(seekBar, 'userSeek_');
+
+  // Simulate a source loaded
+  player.duration(10);
+
+  // Simulate scrub
+  seekBar.handleMouseMove({ pageX: 200 });
+
+  assert.ok(userSeekSpy.notCalled, 'Seek not initiated while scrubbing');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('Seek should occur when scrubbing completes on mobile when disableSeekWhileScrubbingOnMobile is true', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: true });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const userSeekSpy = sinon.spy(seekBar, 'userSeek_');
+  const targetSeekTime = 5;
+
+  // Simulate a source loaded
+  player.duration(10);
+
+  seekBar.pendingSeekTime_ = targetSeekTime;
+
+  // Simulate scrubbing completion
+  seekBar.handleMouseUp();
+
+  assert.ok(userSeekSpy.calledWith(targetSeekTime), 'Seeks to correct location when scrubbing completes');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('Player should pause while scrubbing on mobile when disableSeekWhileScrubbingOnMobile is false', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: false });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const pauseSpy = sinon.spy(player, 'pause');
+
+  // Simulate start playing
+  player.play();
+
+  const mockMouseDownEvent = {
+    pageX: 200,
+    stopPropagation: () => {}
+  };
+
+  // Simulate scrubbing start
+  seekBar.handleMouseDown(mockMouseDownEvent);
+
+  assert.ok(pauseSpy.calledOnce, 'Player paused');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
+QUnit.test('Player should not pause while scrubbing on mobile when disableSeekWhileScrubbingOnMobile is true', function(assert) {
+  const originalIsIos = browser.IS_IOS;
+
+  browser.stub_IS_IOS(true);
+
+  const player = TestHelpers.makePlayer({ disableSeekWhileScrubbingOnMobile: true });
+  const seekBar = player.controlBar.progressControl.seekBar;
+  const pauseSpy = sinon.spy(player, 'pause');
+
+  // Simulate start playing
+  player.play();
+
+  const mockMouseDownEvent = {
+    pageX: 200,
+    stopPropagation: () => { }
+  };
+
+  // Simulate scrubbing start
+  seekBar.handleMouseDown(mockMouseDownEvent);
+
+  assert.ok(pauseSpy.notCalled, 'Player not paused');
+
+  player.dispose();
+  browser.stub_IS_IOS(originalIsIos);
+});
+
 QUnit.test('addSourceElement calls tech method with correct args', function(assert) {
   const player = TestHelpers.makePlayer();
   const addSourceElementSpy = sinon.spy(player.tech_, 'addSourceElement');

From f87a699f2d6834a256cbd0ce5e6ab2dd5b95f61a Mon Sep 17 00:00:00 2001
From: Dzianis Dashkevich
 <98566601+dzianis-dashkevich@users.noreply.github.com>
Date: Mon, 2 Dec 2024 15:11:13 -0500
Subject: [PATCH 4/9] fix: update vhs version (#8930)

bump vhs version (3.16.1)

Co-authored-by: Dzianis Dashkevich <ddashkevich@brightcove.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad7e19f78a..2199c0038c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1791,9 +1791,9 @@
       }
     },
     "@videojs/http-streaming": {
-      "version": "3.16.0",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.0.tgz",
-      "integrity": "sha512-VL8l+JGbc9KqZ1fY2pYgBS1u3i6iQ/5mRAE6bwrI5R0RAtKxur1hjipVGwkkJSYRzwLgArt5Wg5abEjfoJN7yA==",
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.1.tgz",
+      "integrity": "sha512-+5FXE0q8sRD6lPVdGsDL0N8q4+IiQEjMtoCSu0js1oftdCchP9bbhR9ac8XUGJUCZ53KoeY02izkjyGYK2hpGw==",
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "^4.1.1",
diff --git a/package.json b/package.json
index 22600b7615..e0aafefc92 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@videojs/http-streaming": "^3.16.0",
+    "@videojs/http-streaming": "^3.16.1",
     "@videojs/vhs-utils": "^4.1.1",
     "@videojs/xhr": "2.7.0",
     "aes-decrypter": "^4.0.2",

From a7ba9f2fc5e1ccd0da153f52fd73fdf6b78fc30c Mon Sep 17 00:00:00 2001
From: Harisha Rajam Swaminathan
 <35213866+harisha-swaminathan@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:29:33 -0500
Subject: [PATCH 5/9] chore: update VHS version (#8933)

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2199c0038c..b41f82f9af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1791,9 +1791,9 @@
       }
     },
     "@videojs/http-streaming": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.1.tgz",
-      "integrity": "sha512-+5FXE0q8sRD6lPVdGsDL0N8q4+IiQEjMtoCSu0js1oftdCchP9bbhR9ac8XUGJUCZ53KoeY02izkjyGYK2hpGw==",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.2.tgz",
+      "integrity": "sha512-fvt4ko7FknxiT9FnjyNQt6q2px+awrkM+Orv7IB/4gldvj94u4fowGfmNHynnvNTPgPkdxHklGmFLGfclYw8HA==",
       "requires": {
         "@babel/runtime": "^7.12.5",
         "@videojs/vhs-utils": "^4.1.1",
@@ -15061,12 +15061,12 @@
       "dev": true
     },
     "video.js": {
-      "version": "8.19.1",
-      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.19.1.tgz",
-      "integrity": "sha512-MVuayhXpzTBv5Jk3nYEU2akawPhuBBlizEbpQGx2i+6FiBmqxGjkrkLdDLOzG54ut7xapjp26IfWQLGSpeLmcQ==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.20.0.tgz",
+      "integrity": "sha512-VyXY/DbtfaI22gpWJdo8bmTcpPRfKg0SeQJBusRdIJF1RMI+er1BHpRreg67s5Qfd9ZeSbfKShUOwaxRft/tBw==",
       "requires": {
         "@babel/runtime": "^7.12.5",
-        "@videojs/http-streaming": "^3.15.0",
+        "@videojs/http-streaming": "^3.16.0",
         "@videojs/vhs-utils": "^4.1.1",
         "@videojs/xhr": "2.7.0",
         "aes-decrypter": "^4.0.2",
diff --git a/package.json b/package.json
index e0aafefc92..24f9df12f5 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.12.5",
-    "@videojs/http-streaming": "^3.16.1",
+    "@videojs/http-streaming": "^3.16.2",
     "@videojs/vhs-utils": "^4.1.1",
     "@videojs/xhr": "2.7.0",
     "aes-decrypter": "^4.0.2",

From ca6f8235453d0d45ae4d05c8b056e2a8c206bc26 Mon Sep 17 00:00:00 2001
From: hswaminathan <hswaminathan@brightcove.com>
Date: Thu, 5 Dec 2024 14:36:40 -0500
Subject: [PATCH 6/9] 8.21.0

---
 CHANGELOG.md      | 15 +++++++++++++++
 README.md         | 12 ++++++------
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b33264d959..6de5275352 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+<a name="8.21.0"></a>
+# [8.21.0](https://github.com/videojs/video.js/compare/v8.20.0...v8.21.0) (2024-12-05)
+
+### Features
+
+* Add option to disable seeking while scrubbing on mobile ([#8903](https://github.com/videojs/video.js/issues/8903)) ([57d6ab6](https://github.com/videojs/video.js/commit/57d6ab6))
+
+### Bug Fixes
+
+* update vhs version ([#8930](https://github.com/videojs/video.js/issues/8930)) ([f87a699](https://github.com/videojs/video.js/commit/f87a699))
+
+### Chores
+
+* update VHS version ([#8933](https://github.com/videojs/video.js/issues/8933)) ([a7ba9f2](https://github.com/videojs/video.js/commit/a7ba9f2))
+
 <a name="8.20.0"></a>
 # [8.20.0](https://github.com/videojs/video.js/compare/v8.19.2...v8.20.0) (2024-11-19)
 
diff --git a/README.md b/README.md
index 9dcb23c6bf..556e6d15ff 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
 Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:
 
 ```html
-<link href="//vjs.zencdn.net/8.20.0/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/8.20.0/video.min.js"></script>
+<link href="//vjs.zencdn.net/8.21.0/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/8.21.0/video.min.js"></script>
 ```
 
 Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
@@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
 <script src="https://unpkg.com/video.js/dist/video.min.js"></script>
 
 <!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://unpkg.com/video.js@8.20.0/dist/video-js.min.css" rel="stylesheet">
-<script src="https://unpkg.com/video.js@8.20.0/dist/video.min.js"></script>
+<link href="https://unpkg.com/video.js@8.21.0/dist/video-js.min.css" rel="stylesheet">
+<script src="https://unpkg.com/video.js@8.21.0/dist/video.min.js"></script>
 
 <!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video-js.min.css" rel="stylesheet">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.0/video-js.min.css" rel="stylesheet">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.0/video.min.js"></script>
 ```
 
 Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!
diff --git a/package-lock.json b/package-lock.json
index b41f82f9af..426a3a1bb3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "video.js",
-  "version": "8.20.0",
+  "version": "8.21.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 24f9df12f5..aba3103ff1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
-  "version": "8.20.0",
+  "version": "8.21.0",
   "main": "./dist/video.cjs.js",
   "module": "./dist/video.es.js",
   "style": "./dist/video-js.css",

From b6cec4f6b5bbfd22b4c90622370433a20ccf4dba Mon Sep 17 00:00:00 2001
From: SImonAllen <61531170+SimonAllen0901@users.noreply.github.com>
Date: Fri, 6 Dec 2024 05:34:04 +0800
Subject: [PATCH 7/9] chore(lang): update zh-TW translations (#8929)

## Description
- Add "Playing in Picture-in-Picture" translations to zh-TW.json
- Deduplicate object keys in zh-TW.json
- Update translations-needed.md
- Auto-generated - The np.json section removed from
translations-needed.md was a duplicate.

## Specific Changes proposed
- Add missing translation for "Playing in Picture-in-Picture" to zh-TW
locale.
- Remove duplicate keys 'Picture-in-Picture' and 'Exit
Picture-in-Picture' from zh-TW.json to eliminate redundancy.

## Requirements Checklist
- [ ] Feature implemented / Bug fixed
- [ ] If necessary, more likely in a feature request than a bug fix
- [x] Change has been verified in an actual browser (Chrome, Firefox,
IE)
  - [x] Docs/guides updated
- [x] Has no DOM changes which impact accessiblilty or trigger warnings
(e.g. Chrome issues tab)
  - [x] Has no changes to JSDoc which cause `npm run docs:api` to error
- [ ] Example created ([starter template on
JSBin](https://codepen.io/gkatsev/pen/GwZegv?editors=1000#0))
- [ ] Reviewed by Two Core Contributors

---------

Co-authored-by: Harisha Rajam Swaminathan <35213866+harisha-swaminathan@users.noreply.github.com>
---
 docs/translations-needed.md | 14 +++-----------
 lang/zh-TW.json             |  3 +--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/docs/translations-needed.md b/docs/translations-needed.md
index ec1d24fa51..c798fe7971 100644
--- a/docs/translations-needed.md
+++ b/docs/translations-needed.md
@@ -16,7 +16,7 @@ This default value is hardcoded as a default to the localize method in the SeekB
 
 | Language file           | Missing translations                                                                |
 | ----------------------- | ----------------------------------------------------------------------------------- |
-| ar.json (Complete)     |                                                       |
+| ar.json (Complete)      |                                                                                     |
 | az.json (Complete)      |                                                                                     |
 | ba.json (missing 71)    | Audio Player                                                                        |
 |                         | Video Player                                                                        |
@@ -506,6 +506,7 @@ This default value is hardcoded as a default to the localize method in the SeekB
 |                         | Text Background                                                                     |
 |                         | Caption Area Background                                                             |
 |                         | Playing in Picture-in-Picture                                                       |
+| mr.json (Complete)      |                                                                                     |
 | nb.json (Complete)      |                                                                                     |
 | nl.json (missing 1)     | Playing in Picture-in-Picture                                                       |
 | nn.json (missing 10)    | Exit Picture-in-Picture                                                             |
@@ -527,15 +528,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
 |                         | Playing in Picture-in-Picture                                                       |
 |                         | Skip backward {1} seconds                                                           |
 |                         | Skip forward {1} seconds                                                            |
-| np.json (missing 9)     | Drop shadow                                                                         |
-|                         | No content                                                                          |
-|                         | Color                                                                               |
-|                         | Opacity                                                                             |
-|                         | Text Background                                                                     |
-|                         | Caption Area Background                                                             |
-|                         | Playing in Picture-in-Picture                                                       |
-|                         | Skip backward {1} seconds                                                           |
-|                         | Skip forward {1} seconds                                                            |
 | oc.json (missing 7)     | Color                                                                               |
 |                         | Opacity                                                                             |
 |                         | Text Background                                                                     |
@@ -790,6 +782,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
 |                         | Skip forward {1} seconds                                                            |
 | zh-CN.json (missing 2)  | Drop shadow                                                                         |
 |                         | Playing in Picture-in-Picture                                                       |
-| zh-TW.json (missing 1)  | Playing in Picture-in-Picture                                                       |
+| zh-TW.json (Complete)   |                                                                                     |
 
 <!-- END langtable -->
diff --git a/lang/zh-TW.json b/lang/zh-TW.json
index 335837d646..3853dbe17f 100644
--- a/lang/zh-TW.json
+++ b/lang/zh-TW.json
@@ -10,8 +10,6 @@
   "Progress": "進度",
   "Fullscreen": "全螢幕",
   "Exit Fullscreen": "退出全螢幕",
-  "Picture-in-Picture": "子母畫面",
-  "Exit Picture-in-Picture": "退出子母畫面",
   "Mute": "靜音",
   "Unmute": "開啟音效",
   "Playback Rate": " 播放速率",
@@ -87,6 +85,7 @@
   "progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
   "{1} is loading.": "{1} 正在載入。",
   "Exit Picture-in-Picture": "離開子母畫面",
+  "Playing in Picture-in-Picture": "在子母畫面中播放",
   "Picture-in-Picture": "子母畫面",
   "No content": "沒有內容",
   "Color": "顏色",

From a0ca1681f85cdb4b930caf1619221e123a99a254 Mon Sep 17 00:00:00 2001
From: Mejans <61360811+Mejans@users.noreply.github.com>
Date: Thu, 5 Dec 2024 22:46:50 +0100
Subject: [PATCH 8/9] chore: update Occitan locale file (#8927)

## Description

Update for the translation

Co-authored-by: Harisha Rajam Swaminathan <35213866+harisha-swaminathan@users.noreply.github.com>
---
 lang/oc.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lang/oc.json b/lang/oc.json
index 1b434659d9..7ffd11a809 100644
--- a/lang/oc.json
+++ b/lang/oc.json
@@ -86,5 +86,12 @@
   "{1} is loading.": "{1} es a cargar.",
   "Exit Picture-in-Picture": "Sortir de la vidèo incrustada",
   "Picture-in-Picture": "Vidèo incrustada",
-  "No content": "Cap de contengut"  
+  "No content": "Cap de contengut",
+  "Color": "Color",
+  "Opacity": "Opacitat",
+  "Text Background": "Rèireplan del tèxte",
+  "Caption Area Background": "Rèireplan de la zòna de la legenda",
+  "Playing in Picture-in-Picture": "Lectura en vidèo incrustada",
+  "Skip backward {1} seconds": "Avançar de {1} segondas",
+  "Skip forward {1} seconds": "Recular de {1} segondas"
 }

From 19ca3f2ebe0ec7f0374fa3bc7df1457f9f185823 Mon Sep 17 00:00:00 2001
From: hswaminathan <hswaminathan@brightcove.com>
Date: Thu, 5 Dec 2024 16:48:07 -0500
Subject: [PATCH 9/9] 8.21.1

---
 CHANGELOG.md      |  8 ++++++++
 README.md         | 12 ++++++------
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6de5275352..611584eb90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="8.21.1"></a>
+## [8.21.1](https://github.com/videojs/video.js/compare/v8.21.0...v8.21.1) (2024-12-05)
+
+### Chores
+
+* **lang:** update zh-TW translations ([#8929](https://github.com/videojs/video.js/issues/8929)) ([b6cec4f](https://github.com/videojs/video.js/commit/b6cec4f)), closes [1000#0](https://github.com/1000/issues/0)
+* update Occitan locale file ([#8927](https://github.com/videojs/video.js/issues/8927)) ([a0ca168](https://github.com/videojs/video.js/commit/a0ca168))
+
 <a name="8.21.0"></a>
 # [8.21.0](https://github.com/videojs/video.js/compare/v8.20.0...v8.21.0) (2024-12-05)
 
diff --git a/README.md b/README.md
index 556e6d15ff..c2606b50b9 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
 Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:
 
 ```html
-<link href="//vjs.zencdn.net/8.21.0/video-js.min.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/8.21.0/video.min.js"></script>
+<link href="//vjs.zencdn.net/8.21.1/video-js.min.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/8.21.1/video.min.js"></script>
 ```
 
 Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
@@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
 <script src="https://unpkg.com/video.js/dist/video.min.js"></script>
 
 <!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://unpkg.com/video.js@8.21.0/dist/video-js.min.css" rel="stylesheet">
-<script src="https://unpkg.com/video.js@8.21.0/dist/video.min.js"></script>
+<link href="https://unpkg.com/video.js@8.21.1/dist/video-js.min.css" rel="stylesheet">
+<script src="https://unpkg.com/video.js@8.21.1/dist/video.min.js"></script>
 
 <!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
-<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.0/video-js.min.css" rel="stylesheet">
-<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.0/video.min.js"></script>
+<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video-js.min.css" rel="stylesheet">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video.min.js"></script>
 ```
 
 Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!
diff --git a/package-lock.json b/package-lock.json
index 426a3a1bb3..ee7082ccad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "video.js",
-  "version": "8.21.0",
+  "version": "8.21.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index aba3103ff1..5649dd72a7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
-  "version": "8.21.0",
+  "version": "8.21.1",
   "main": "./dist/video.cjs.js",
   "module": "./dist/video.es.js",
   "style": "./dist/video-js.css",