Skip to content

Commit ff2484a

Browse files
authored
Merge pull request phaserjs#4936 from AdamXA/fix-external-fullscreen-api-calls
Fixes external Fullscreen API calls being blocked by fullscreenchange listener
2 parents 2bb1f08 + cf4a4e2 commit ff2484a

1 file changed

Lines changed: 1 addition & 17 deletions

File tree

src/scale/ScaleManager.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -346,16 +346,6 @@ var ScaleManager = new Class({
346346
*/
347347
this._createdFullscreenTarget = false;
348348

349-
/**
350-
* Internal var that keeps track of the user, or the browser, requesting fullscreen changes.
351-
*
352-
* @name Phaser.Scale.ScaleManager#_requestedFullscreenChange
353-
* @type {boolean}
354-
* @private
355-
* @since 3.16.2
356-
*/
357-
this._requestedFullscreenChange = false;
358-
359349
/**
360350
* The dirty state of the Scale Manager.
361351
* Set if there is a change between the parent size and the current size.
@@ -1238,8 +1228,6 @@ var ScaleManager = new Class({
12381228
{
12391229
var fsTarget = this.getFullscreenTarget();
12401230

1241-
this._requestedFullscreenChange = true;
1242-
12431231
var fsPromise;
12441232

12451233
if (fullscreen.keyboard)
@@ -1382,8 +1370,6 @@ var ScaleManager = new Class({
13821370

13831371
if (fullscreen.active)
13841372
{
1385-
this._requestedFullscreenChange = true;
1386-
13871373
document[fullscreen.cancel]();
13881374
}
13891375

@@ -1490,12 +1476,10 @@ var ScaleManager = new Class({
14901476
onFullScreenChange: function ()
14911477
{
14921478
// They pressed ESC while in fullscreen mode
1493-
if (!this._requestedFullscreenChange)
1479+
if (!(document.fullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement || document.mozFullScreenElement))
14941480
{
14951481
this.stopFullscreen();
14961482
}
1497-
1498-
this._requestedFullscreenChange = false;
14991483
},
15001484

15011485
/**

0 commit comments

Comments
 (0)