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

Jump to bottom

Update from main (production) #1380

Merged
merged 3 commits into from
Sep 20, 2023
Merged

Update from main (production) #1380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a42d93f
Attempt at small rework of setupOnYouTubeIframeAPIReady and Deferred …
bryanlandia Sep 19, 2023
88eb438
Remove newer error handling code and try simple fix
bryanlandia Sep 19, 2023
97a3e4d
Merge pull request #1379 from appsembler/bugfix/ENG-97-rework-onytifr…
bryanlandia Sep 20, 2023
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
49 changes: 12 additions & 37 deletions common/lib/xmodule/xmodule/js/src/video/01_initialize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,49 +164,23 @@ function(VideoPlayer, i18n, moment, _) {
// so that it resolves our Deferred object, which will call all of the
// OnYouTubeIframeAPIReady callbacks.
//
// If this global function is already defined, we store it first, and make
// sure that it gets executed when our Deferred object is resolved.
let setupOnYouTubeIframeAPIReadyCallsCount = 0;

setupOnYouTubeIframeAPIReady = function() {
setupOnYouTubeIframeAPIReadyCallsCount++;
if (setupOnYouTubeIframeAPIReadyCallsCount > setupOnYouTubeIframeAPIReadyMaxCalls) {
throw new Error('Too many OnYouTubeIframeAPIReady retries after TypeError...giving up.');
}

handleYTAPIErr = function(ytapierr) {
console.error('Error while trying to resolve the Deferred object responsible for calling OnYouTubeIframeAPIReady callbacks.');
console.debug('window.onYouTubeIframeAPIReady is ' + window.onYouTubeIframeAPIReady);
console.error(ytapierr);
if (ytapierr instanceof TypeError) { // expecting TypeError: window.onYouTubeIframeAPIReady.resolve is not a function
setTimeout(setupOnYouTubeIframeAPIReady, 500); // Try again up to defined max calls.
}
else {
throw ytapierr;
}
};
let setupOnYouTubeIframeAPIReady = function() {

try {
_oldOnYouTubeIframeAPIReady = window.onYouTubeIframeAPIReady || undefined;
// If this global function is already defined, we store it first, and make
// sure that it gets executed when our Deferred object is resolved.
_oldOnYouTubeIframeAPIReady = window.onYouTubeIframeAPIReady || undefined;

window.onYouTubeIframeAPIReady = function() {
try { // this additional inner try/catch shouldn't really be needed but it's here just in case.
window.onYouTubeIframeAPIReady.resolve();
} catch (ytapiresolveerr) {
handleYTAPIErr(ytapiresolveerr);
}
};
window.onYouTubeIframeAPIReady = function() {
_youtubeApiDeferred.resolve();
}

window.onYouTubeIframeAPIReady.resolve = _youtubeApiDeferred.resolve;
window.onYouTubeIframeAPIReady.done = _youtubeApiDeferred.done;
window.onYouTubeIframeAPIReady.resolve = _youtubeApiDeferred.resolve;
window.onYouTubeIframeAPIReady.done = _youtubeApiDeferred.done;

if (_oldOnYouTubeIframeAPIReady) {
window.onYouTubeIframeAPIReady.done(_oldOnYouTubeIframeAPIReady);
}
} catch (ytapierr) {
handleYTAPIErr(ytapierr);
if (_oldOnYouTubeIframeAPIReady) {
window.onYouTubeIframeAPIReady.done(_oldOnYouTubeIframeAPIReady);
}

};

// If a Deferred object hasn't been created yet, create one now. It will
Expand All @@ -230,6 +204,7 @@ function(VideoPlayer, i18n, moment, _) {
window.YT.ready(onYTApiReady);
});
}

} else {
video = VideoPlayer(state);

Expand Down
Loading