Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Bubble progress events #978

Merged
merged 1 commit into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/segment-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,9 @@ export default class SegmentLoader extends videojs.EventTarget {
});

segmentXhr = this.hls_.xhr(segmentRequestOptions, this.handleResponse_.bind(this));
segmentXhr.addEventListener('progress', (event) => {
this.trigger(event);
});

this.xhr_ = {
keyXhr,
Expand Down
15 changes: 15 additions & 0 deletions test/segment-loader.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,21 @@ QUnit.test('segment request timeouts reset bandwidth', function(assert) {
assert.ok(isNaN(loader.roundTrip), 'reset round trip time');
});

QUnit.test('progress on segment requests are redispatched', function(assert) {
let progressEvents = 0;

loader.on('progress', function() {
progressEvents++;
});
loader.playlist(playlistWithDuration(10));
loader.mimeType(this.mimeType);
loader.load();
this.clock.tick(1);

this.requests[0].dispatchEvent({ type: 'progress' });
assert.equal(progressEvents, 1, 'triggered progress');
});

QUnit.test('updates timestamps when segments do not start at zero', function(assert) {
let playlist = playlistWithDuration(10);

Expand Down