Added touch Window handlers and remove handlers

Author: photonstorm

src/core/Config.js

@@ -276,7 +276,7 @@ var Config = new Class({
         this.inputQueue = GetValue(config, 'input.queue', false);
 
         /**
-         * @const {boolean} Phaser.Core.Config#inputWindowEvents - Should Phaser listen for input events on the Window?
+         * @const {boolean} Phaser.Core.Config#inputWindowEvents - Should Phaser listen for input events on the Window? If you disable this, events like 'POINTER_UP_OUTSIDE' will no longer fire.
          */
         this.inputWindowEvents = GetValue(config, 'input.windowEvents', true);
 

src/core/typedefs/InputConfig.js

@@ -9,4 +9,5 @@
  * @property {integer} [activePointers=1] - The maximum number of touch pointers. See {@link Phaser.Input.InputManager#pointers}.
  * @property {number} [smoothFactor=0] - The smoothing factor to apply during Pointer movement. See {@link Phaser.Input.Pointer#smoothFactor}.
  * @property {boolean} [inputQueue=false] - Should Phaser use a queued input system for native DOM Events or not?
+ * @property {boolean} [windowEvents=true] - Should Phaser listen for input events on the Window? If you disable this, events like 'POINTER_UP_OUTSIDE' will no longer fire.
  */

src/input/mouse/MouseManager.js

@@ -304,8 +304,6 @@ var MouseManager = new Class({
 
         this.onMouseDown = function (event)
         {
-            console.log('down');
-
             if (autoFocus)
             {
                 window.focus();
@@ -327,8 +325,6 @@ var MouseManager = new Class({
 
         this.onMouseDownWindow = function (event)
         {
-            console.log('window down');
-
             if (event.defaultPrevented || !_this.enabled || !_this.manager)
             {
                 // Do nothing if event already handled
@@ -337,8 +333,6 @@ var MouseManager = new Class({
 
             if (event.target !== canvas)
             {
-                console.log('window process');
-
                 //  Only process the event if the target isn't the canvas
                 _this.manager.queueMouseDown(event);
             }
@@ -457,8 +451,8 @@ var MouseManager = new Class({
 
         if (window)
         {
-            window.removeEventListener('mousedown', this.onMouseDown);
-            window.removeEventListener('mouseup', this.onMouseUp);
+            window.removeEventListener('mousedown', this.onMouseDownWindow);
+            window.removeEventListener('mouseup', this.onMouseUpWindow);
         }
 
         if (Features.pointerLock)

src/input/touch/TouchManager.js

@@ -83,6 +83,16 @@ var TouchManager = new Class({
          */
         this.onTouchStart = NOOP;
 
+        /**
+         * The Touch Start event handler function specifically for events on the Window.
+         * Initially empty and bound in the `startListeners` method.
+         *
+         * @name Phaser.Input.Touch.TouchManager#onTouchStartWindow
+         * @type {function}
+         * @since 3.16.3
+         */
+        this.onTouchStartWindow = NOOP;
+
         /**
          * The Touch Move event handler function.
          * Initially empty and bound in the `startListeners` method.
@@ -103,6 +113,16 @@ var TouchManager = new Class({
          */
         this.onTouchEnd = NOOP;
 
+        /**
+         * The Touch End event handler function specifically for events on the Window.
+         * Initially empty and bound in the `startListeners` method.
+         *
+         * @name Phaser.Input.Touch.TouchManager#onTouchEndWindow
+         * @type {function}
+         * @since 3.16.3
+         */
+        this.onTouchEndWindow = NOOP;
+
         /**
          * The Touch Cancel event handler function.
          * Initially empty and bound in the `startListeners` method.
@@ -199,6 +219,21 @@ var TouchManager = new Class({
             }
         };
 
+        this.onTouchStartWindow = function (event)
+        {
+            if (event.defaultPrevented || !_this.enabled || !_this.manager)
+            {
+                //  Do nothing if event already handled
+                return;
+            }
+    
+            if (event.target !== canvas)
+            {
+                //  Only process the event if the target isn't the canvas
+                _this.manager.queueTouchStart(event);
+            }
+        };
+
         this.onTouchMove = function (event)
         {
             if (event.defaultPrevented || !_this.enabled || !_this.manager)
@@ -231,6 +266,21 @@ var TouchManager = new Class({
             }
         };
 
+        this.onTouchEndWindow = function (event)
+        {
+            if (event.defaultPrevented || !_this.enabled || !_this.manager)
+            {
+                //  Do nothing if event already handled
+                return;
+            }
+    
+            if (event.target !== canvas)
+            {
+                //  Only process the event if the target isn't the canvas
+                _this.manager.queueTouchEnd(event);
+            }
+        };
+
         this.onTouchCancel = function (event)
         {
             if (event.defaultPrevented || !_this.enabled || !_this.manager)
@@ -286,10 +336,10 @@ var TouchManager = new Class({
         target.addEventListener('touchover', this.onTouchOver, (this.capture) ? nonPassive : passive);
         target.addEventListener('touchout', this.onTouchOut, (this.capture) ? nonPassive : passive);
 
-        if (window)
+        if (window && this.manager.game.config.inputWindowEvents)
         {
-            window.addEventListener('touchstart', this.onTouchStart, nonPassive);
-            window.addEventListener('touchend', this.onTouchEnd, nonPassive);
+            window.addEventListener('touchstart', this.onTouchStartWindow, nonPassive);
+            window.addEventListener('touchend', this.onTouchEndWindow, nonPassive);
         }
 
         this.enabled = true;
@@ -315,8 +365,8 @@ var TouchManager = new Class({
 
         if (window)
         {
-            window.removeEventListener('touchstart', this.onTouchStart);
-            window.removeEventListener('touchend', this.onTouchEnd);
+            window.removeEventListener('touchstart', this.onTouchStartWindow);
+            window.removeEventListener('touchend', this.onTouchEndWindow);
         }
     },