maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Added try-catch block when activating google cal sync

Browse source
This commit is contained in:
alext 2017-03-10 09:23:31 +01:00
parent 8f974150c5
commit 34a7277a1e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/assets/js/backend_calendar_google_sync.js
View file

@ -47,7 +47,8 @@ window.BackendCalendarGoogleSync = window.BackendCalendarGoogleSync || {};
// When the browser redirects to the google user consent page the "window.document" variable // When the browser redirects to the google user consent page the "window.document" variable
// becomes "undefined" and when it comes back to the redirect URL it changes back. So check // becomes "undefined" and when it comes back to the redirect URL it changes back. So check
// whether the variable is undefined to avoid javascript errors. // whether the variable is undefined to avoid javascript errors.
if (windowHandle.document !== undefined) { try {
if (windowHandle.document !== undefined) {
if (windowHandle.document.URL.indexOf(redirectUrl) !== -1) { if (windowHandle.document.URL.indexOf(redirectUrl) !== -1) {
// The user has granted access to his data. // The user has granted access to his data.
windowHandle.close(); windowHandle.close();
@ -81,6 +82,11 @@ window.BackendCalendarGoogleSync = window.BackendCalendarGoogleSync || {};
}, 'json').fail(GeneralFunctions.ajaxFailureHandler); }, 'json').fail(GeneralFunctions.ajaxFailureHandler);
} }
} }
} catch(Error) {
// Accessing the document object before the window is loaded throws an error, but
// it will only happen during the initialization of the window. Attaching "load"
// event handling is not possible due to CORS restrictions.
}
}, 100); }, 100);
} else { } else {