Skip to content

Commit 672c08c

Browse files
authored
Merge pull request phaserjs#5197 from samme/x/startFullscreen
Fix startFullscreen() failure in Safari
2 parents 37a6bba + ee284c6 commit 672c08c

1 file changed

Lines changed: 8 additions & 19 deletions

File tree

src/scale/ScaleManager.js

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,28 +1229,13 @@ var ScaleManager = new Class({
12291229
{
12301230
var fsTarget = this.getFullscreenTarget();
12311231

1232-
var fsPromise;
1233-
12341232
if (fullscreen.keyboard)
12351233
{
1236-
fsPromise = fsTarget[fullscreen.request](Element.ALLOW_KEYBOARD_INPUT);
1234+
fsTarget[fullscreen.request](Element.ALLOW_KEYBOARD_INPUT);
12371235
}
12381236
else
12391237
{
1240-
fsPromise = fsTarget[fullscreen.request](fullscreenOptions);
1241-
}
1242-
1243-
if (fsPromise)
1244-
{
1245-
fsPromise.then(this.fullscreenSuccessHandler.bind(this)).catch(this.fullscreenErrorHandler.bind(this));
1246-
}
1247-
else if (fullscreen.active)
1248-
{
1249-
this.fullscreenSuccessHandler();
1250-
}
1251-
else
1252-
{
1253-
this.fullscreenErrorHandler();
1238+
fsTarget[fullscreen.request](fullscreenOptions);
12541239
}
12551240
}
12561241
},
@@ -1476,9 +1461,13 @@ var ScaleManager = new Class({
14761461
*/
14771462
onFullScreenChange: function ()
14781463
{
1479-
// They pressed ESC while in fullscreen mode
1480-
if (!(document.fullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement || document.mozFullScreenElement))
1464+
if (document.fullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement || document.mozFullScreenElement)
1465+
{
1466+
this.fullscreenSuccessHandler();
1467+
}
1468+
else
14811469
{
1470+
// They pressed ESC while in fullscreen mode
14821471
this.stopFullscreen();
14831472
}
14841473
},

0 commit comments

Comments
 (0)