web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2025-01-02 06:32:07 +02:00
Code Releases Activity

fix(seek-bar): error when scrubbing after player reset (#8257)

Browse Source
This commit is contained in:
André 2023-05-31 16:30:13 +02:00 committed by GitHub
parent 5151bc5970
commit e73e05db8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/control-bar/progress-control/seek-bar.js
View File

@ -273,7 +273,7 @@ class SeekBar extends Slider {
* @listens mousemove
*/
handleMouseMove(event, mouseDown = false) {
if (!Dom.isSingleLeftClick(event)) {
if (!Dom.isSingleLeftClick(event) || isNaN(this.player_.duration())) {
return;
}

2
test/unit/controls.test.js
View File

@ -151,6 +151,8 @@ QUnit.test("SeekBar doesn't set scrubbing on mouse down, only on mouse move", fu
const seekBar = new SeekBar(player);
const doc = new EventTarget();
player.duration(0);
// mousemove is listened to on the document.
// Specifically, we check the ownerDocument of the seekBar's bar.
// Therefore, we want to mock it out to be able to trigger mousemove

17
test/unit/reset-ui.test.js
View File

@ -52,21 +52,29 @@ QUnit.test('Calling resetProgressBar should reset the components displaying time
// Do reset
player.resetProgressBar_();
player.duration(0);
// Allows to have a duration state similar to player.reset() by combining the durationchange
player.duration(NaN);
player.trigger('durationchange');
clock.tick(30);
const calculateDistance = sinon.spy(seekBar, 'calculateDistance');
// Simulate a mouse move
seekBar.handleMouseMove({ offsetX: 1 });
assert.equal(player.currentTime(), 0, 'player current time is 0');
// Current time display
assert.equal(currentTimeDisplay.textNode_.textContent, '0:00', 'current time display is 0:00');
// Duration display
assert.equal(durationDisplay.textNode_.textContent, '0:00', 'duration display is 0:00');
assert.equal(durationDisplay.textNode_.textContent, '-:-', 'duration display is -:-');
// Remaining time display
assert.equal(remainingTimeDisplay.textNode_.textContent, '0:00', 'remaining time display is 0:00');
assert.equal(remainingTimeDisplay.textNode_.textContent, '-:-', 'remaining time display is -:-');
// Seek bar
assert.equal(seekBar.getProgress(), '0', 'seek bar progress is 0');
assert.equal(seekBar.getAttribute('aria-valuetext'), '0:00 of 0:00', 'seek bar progress holder aria value text is 0:00 of 0:00');
assert.equal(seekBar.getAttribute('aria-valuetext'), '0:00 of -:-', 'seek bar progress holder aria value text is 0:00 of -:-');
assert.equal(seekBar.getAttribute('aria-valuenow'), '0.00', 'seek bar progress holder aria value now is 0.00');
assert.ok(!calculateDistance.called, 'calculateDistance was not called');
// Load progress
assert.equal(seekBar.loadProgressBar.el().textContent, 'Loaded: 0.00%', 'load progress bar textContent is Loaded: 0.00%');
assert.equal(seekBar.loadProgressBar.el().style.width, '0%', 'load progress bar width is 0%');
@ -76,6 +84,7 @@ QUnit.test('Calling resetProgressBar should reset the components displaying time
assert.equal(seekBar.playProgressBar.timeTooltip.el().textContent, '0:00', 'player progress bar time tooltip is 0:00');
clock.restore();
calculateDistance.restore();
player.dispose();
});