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

ENG-97 Refactor try/catch for window.onYouTubeIframeAPIReady.resolve on video initialization #1371

Merged
merged 1 commit into from
Sep 18, 2023
+19 −11
Merged

ENG-97 Refactor try/catch for window.onYouTubeIframeAPIReady.resolve on video initialization #1371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 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 @@ -174,11 +174,27 @@ function(VideoPlayer, i18n, moment, _) {
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;
}
};

try {
_oldOnYouTubeIframeAPIReady = window.onYouTubeIframeAPIReady || undefined;

window.onYouTubeIframeAPIReady = function() {
window.onYouTubeIframeAPIReady.resolve();
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.resolve = _youtubeApiDeferred.resolve;
Expand All @@ -187,16 +203,8 @@ function(VideoPlayer, i18n, moment, _) {
if (_oldOnYouTubeIframeAPIReady) {
window.onYouTubeIframeAPIReady.done(_oldOnYouTubeIframeAPIReady);
}
} catch (e) {
console.error('Error while trying to resolve the Deferred object responsible for calling OnYouTubeIframeAPIReady callbacks.');
console.error('window.onYouTubeIframeAPIReady is ' + window.onYouTubeIframeAPIReady);
console.error(e);
if (e instanceof TypeError) {
setTimeout(setupOnYouTubeIframeAPIReady, 500); // Try again up to defined max calls.
}
else {
throw e;
}
} catch (ytapierr) {
handleYTAPIErr(ytapierr);
}

};
Expand Down
Loading