Merge branch 'breaking/mouseWheel-disable'

dhashvir · May 29, 2020 · bdf8be1 · bdf8be1
2 parents b7a9691 + 4b8759c
commit bdf8be1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/Game.js b/src/core/Game.js
@@ -563,7 +563,7 @@ Phaser.Game = function (width, height, renderer, parent, state, transparent, ant
  * @property {boolean}            [GameConfig.keyboard=true]                 - Starts the keyboard input handler.
  * @property {number}             [GameConfig.maxPointers=-1]                - Sets {@link Phaser.Input#maxPointers}.
  * @property {boolean}            [GameConfig.mouse=true]                    - Starts the mouse input handler, if the mspointer and touch handlers were not started.
- * @property {boolean}            [GameConfig.mouseWheel=true]               - Starts the {@link Phaser.MouseWheel mouse wheel} handler, if supported by the device.
+ * @property {boolean}            [GameConfig.mouseWheel=false]               - Starts the {@link Phaser.MouseWheel mouse wheel} handler, if supported by the device.
  * @property {boolean}            [GameConfig.mspointer=true]                - Starts the {@link Phaser.MSPointer Pointer Events} handler (mspointer), if supported by the device.
  * @property {boolean}            [GameConfig.multiTexture=false]            - Enable support for multiple bound Textures in WebGL. Same as `{renderer: Phaser.WEBGL_MULTI}`.
  * @property {string|HTMLElement} [GameConfig.parent='']                     - The DOM element into which this games canvas will be injected.

diff --git a/src/input/Input.js b/src/input/Input.js
@@ -417,7 +417,7 @@ Phaser.Input.prototype = {
      * @property {boolean} [keyboard=true]
      * @property {boolean} [maxPointers=-1]
      * @property {boolean} [mouse=true]
-     * @property {boolean} [mouseWheel=true]
+     * @property {boolean} [mouseWheel=false]
      * @property {boolean} [mspointer=true]
      * @property {boolean} [pointerLock=true]
      * @property {boolean} [touch=true]
@@ -490,7 +490,7 @@ Phaser.Input.prototype = {
 
         this.mousePointer.active = true;
 
-        if (config.mouseWheel !== false)
+        if (config.mouseWheel === true)
         {
             this.mouseWheel.start();
         }