Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Race canplay event with a setTimeout. #136

Merged
merged 7 commits into from
Dec 11, 2015
Merged

Race canplay event with a setTimeout. #136

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35690e6
Race canplay event with a setTimeout.
gkatsev Dec 10, 2015
374a063
Add sudo:false to use container arch on travis
gkatsev Dec 10, 2015
d479ac9
Reset call count for setTimeout spies.
gkatsev Dec 10, 2015
074b1e4
Add test to see that both ways to tryToResume work
gkatsev Dec 10, 2015
4912997
Use spy.reset() to reset callCount.
gkatsev Dec 10, 2015
57e22ed
Fix jshint issues. 'let' is es6-only.
gkatsev Dec 10, 2015
a0175da
Make tryToResumeTimeout private (append _).
gkatsev Dec 10, 2015
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
16 changes: 16 additions & 0 deletions src/videojs.ads.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,22 @@ var
// determine if the video element has loaded enough of the snapshot source
// to be ready to apply the rest of the state
tryToResume = function() {

// tryToResume can either have been called through the `contentcanplay`
// event or fired through setTimeout.
// When tryToResume is called, we should make sure to clear out the other
// way it could've been called by removing the listener and clearing out
// the timeout.
player.off('contentcanplay', tryToResume);
if (player.ads.tryToResumeTimeout) {
player.clearTimeout(player.ads.tryToResumeTimeout);
player.ads.tryToResumeTimeout = null;
}

// Tech may have changed depending on the differences in sources of the
// original video and that of the ad
tech = player.el().querySelector('.vjs-tech');

if (tech.readyState > 1) {
// some browsers and media aren't "seekable".
// readyState greater than 1 allows for seeking without exceptions
Expand Down Expand Up @@ -211,7 +224,10 @@ var
// safari requires a call to `load` to pick up a changed source
player.load();
// and then resume from the snapshots time once the original src has loaded
// in some browsers (firefox) `canplay` may not fire correctly.
// Reace the `canplay` event with a timeout.
player.one('contentcanplay', tryToResume);
player.ads.tryToResumeTimeout = player.setTimeout(tryToResume, 2000);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used 2 seconds here. I'm not sure what this should actually be.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should suffix this with an underscore so it's obvious it's an internal variable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

} else if (!player.ended() || !snapshot.ended) {
// if we didn't change the src, just restore the tracks
restoreTracks();
Expand Down