mirror of
https://github.com/photonstorm/phaser
synced 2025-02-17 14:38:30 +00:00
Merge pull request #5197 from samme/x/startFullscreen
Fix startFullscreen() failure in Safari
This commit is contained in:
commit
672c08ce99
1 changed files with 8 additions and 19 deletions
|
@ -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();
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Reference in a new issue