do not reset videojs when autoSetupTimeout called on autoSetup retry #3233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks! |
| @@ -72,7 +72,8 @@ var autoSetup = function(){ | |||
|
|
|||
| // Pause to let the DOM keep processing | |||
| var autoSetupTimeout = function(wait, vjs){ | |||
| videojs = vjs; | |||
| if (vjs) | |||
There was a problem hiding this comment.
our style guide requires to add curly braces around all blocks, but I can just add them during the merge.
|
LGTM |
jgubman
added a commit
to jgubman/video.js
that referenced
this pull request
Apr 26, 2016
* upstream/stable: (77 commits) v5.9.2 @gkatsev grouped text track errors in the console, if we can. closes videojs#3259 v5.9.1 @gkatsev fixed text track tests for older IEs. closes videojs#3269 revert 75116d4 adding chrome to travis (videojs#3254) @forbesjo added back the background color to the poster. closes videojs#3267 @gkatsev fixed removeRemoteTextTracks not working with return value from addRemoteTextTracks. closes videojs#3253 @gkatsev made the first emulated text track enabled by default. closes videojs#3248 @mister-ben blacklisted Chrome for Android for playback rate support. closes videojs#3246 @benjipott updated IS_CHROME to not be true on MS Edge. closes videojs#3232 v5.9.0 @andyearnshaw updated document event handlers to use el.ownerDocument. closes videojs#3230 @chrisauclair added ARIA region and label to player element. closes videojs#3227 @MCGallaspy added vttjs to the self-hosting guide. closes videojs#3229 @forbesjo added chrome for PR tests. closes videojs#3235 @OwenEdwards improved handling of deprecated use of Button component. closes videojs#3236 v5.8.8 @seescode fixed dragging on mute toggle changing the volume. Fixes videojs#3036. Closes videojs#3228 @seescode fixed css failing on IE8 due to incorrect ie8 hack. Fixes videojs#3140. Closes videojs#3226. @vtytar fixed auto-setup failing if taking too long to load. Fixes videojs#2386. Closes videojs#3233. ...
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When autoSetupTimeout is called as a retry, it resets videojs variable to undefined, failing consequent auto-setup. See autoSetupTimeout in src/js/setup.js:
if (mediaEl && mediaEl.getAttribute) {
// ...
} else {
autoSetupTimeout(1);
break;
}
Solution
Avoid videojs redefinition when autoSetupTimeout called without second argument (on autoSetup retry). It solves issue #2386.