From 0d342ee4172244143b44b6a97be32d7cdb47fcff Mon Sep 17 00:00:00 2001
From: Dimava <dimava2@ya.ru>
Date: Mon, 1 Jun 2020 02:36:41 +0300
Subject: [PATCH] move KeyMouse listeners to correct location

---
 src/js/core/input_distributor.js | 13 +++++++++----
 src/js/game/camera.js            |  2 --
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js
index e46a3076..03ad8e0c 100644
--- a/src/js/core/input_distributor.js
+++ b/src/js/core/input_distributor.js
@@ -141,8 +141,13 @@ export class InputDistributor {
     bindToEvents() {
         window.addEventListener("popstate", this.handleBackButton.bind(this), false);
         document.addEventListener("backbutton", this.handleBackButton.bind(this), false);
-        window.addEventListener("keydown", this.handleKeydown.bind(this));
-        window.addEventListener("keyup", this.handleKeyup.bind(this));
+
+        window.addEventListener("keydown", this.handleKeyMouseDown.bind(this));
+        window.addEventListener("keyup", this.handleKeyMouseUp.bind(this));
+
+        window.addEventListener("mousedown", this.handleKeyMouseDown.bind(this));
+        window.addEventListener("mouseup", this.handleKeyMouseUp.bind(this));
+
         window.addEventListener("blur", this.handleBlur.bind(this));
     }
 
@@ -184,7 +189,7 @@ export class InputDistributor {
     /**
      * @param {KeyboardEvent | MouseEvent} event
      */
-    handleKeydown(event) {
+    handleKeyMouseDown(event) {
         const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
         if (
             keyCode === 4 || // MB4
@@ -224,7 +229,7 @@ export class InputDistributor {
     /**
      * @param {KeyboardEvent | MouseEvent} event
      */
-    handleKeyup(event) {
+    handleKeyMouseUp(event) {
         const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
         this.keysDown.delete(keyCode);
 
diff --git a/src/js/game/camera.js b/src/js/game/camera.js
index da2ab3f0..2e558216 100644
--- a/src/js/game/camera.js
+++ b/src/js/game/camera.js
@@ -443,7 +443,6 @@ export class Camera extends BasicSerializableObject {
         } else if (event.button === 2) {
             this.downPreHandler.dispatch(new Vector(event.clientX, event.clientY), enumMouseButton.right);
         }
-        this.root.app.inputMgr.handleKeydown(event);
         return false;
     }
 
@@ -485,7 +484,6 @@ export class Camera extends BasicSerializableObject {
         if (!this.checkPreventDoubleMouse()) {
             return;
         }
-        this.root.app.inputMgr.handleKeyup(event);
 
         this.combinedSingleTouchStopHandler(event.clientX, event.clientY);
         return false;