Merge pull request #5197 from samme/x/startFullscreen

Fix startFullscreen() failure in Safari
This commit is contained in:
Richard Davey 2020-07-13 13:02:16 +01:00 committed by GitHub
commit 672c08ce99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1229,28 +1229,13 @@ var ScaleManager = new Class({
{
var fsTarget = this.getFullscreenTarget();
var fsPromise;
if (fullscreen.keyboard)
{
fsPromise = fsTarget[fullscreen.request](Element.ALLOW_KEYBOARD_INPUT);
fsTarget[fullscreen.request](Element.ALLOW_KEYBOARD_INPUT);
}
else
{
fsPromise = fsTarget[fullscreen.request](fullscreenOptions);
}
if (fsPromise)
{
fsPromise.then(this.fullscreenSuccessHandler.bind(this)).catch(this.fullscreenErrorHandler.bind(this));
}
else if (fullscreen.active)
{
this.fullscreenSuccessHandler();
}
else
{
this.fullscreenErrorHandler();
fsTarget[fullscreen.request](fullscreenOptions);
}
}
},
@ -1476,9 +1461,13 @@ var ScaleManager = new Class({
*/
onFullScreenChange: function ()
{
// They pressed ESC while in fullscreen mode
if (!(document.fullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement || document.mozFullScreenElement))
if (document.fullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement || document.mozFullScreenElement)
{
this.fullscreenSuccessHandler();
}
else
{
// They pressed ESC while in fullscreen mode
this.stopFullscreen();
}
},