From b92b7304b02d779f273323971606ce16797f320b Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Thu, 11 Feb 2021 21:48:24 +0100 Subject: [PATCH] Fix to use clear All Keys --- front/src/Administration/ConsoleGlobalMessageManager.ts | 2 +- front/src/Phaser/Game/GameScene.ts | 2 +- front/src/Phaser/Menu/MenuScene.ts | 2 +- front/src/Phaser/UserInput/UserInputManager.ts | 6 +++++- front/src/WebRtc/DiscussionManager.ts | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/front/src/Administration/ConsoleGlobalMessageManager.ts b/front/src/Administration/ConsoleGlobalMessageManager.ts index 5391b6a0..1833d7cd 100644 --- a/front/src/Administration/ConsoleGlobalMessageManager.ts +++ b/front/src/Administration/ConsoleGlobalMessageManager.ts @@ -332,7 +332,7 @@ export class ConsoleGlobalMessageManager { } active(){ - this.userInputManager.clearAllInputKeyboard(); + this.userInputManager.clearAllKeys(); this.divMainConsole.style.top = '0'; this.activeConsole = true; } diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index 7138330a..a5f29364 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -1263,7 +1263,7 @@ export class GameScene extends ResizableScene implements CenterListener { private bannedUser(){ this.cleanupClosingScene(); - this.userInputManager.clearAllInputKeyboard(); + this.userInputManager.clearAllKeys(); this.scene.start(ErrorSceneName, { title: 'Banned', subTitle: 'You was banned of WorkAdventure', diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts index 872af30c..acc1ec3d 100644 --- a/front/src/Phaser/Menu/MenuScene.ts +++ b/front/src/Phaser/Menu/MenuScene.ts @@ -269,7 +269,7 @@ export class MenuScene extends Phaser.Scene { middleX = 0; } - gameManager.getCurrentGameScene(this).userInputManager.clearAllInputKeyboard(); + gameManager.getCurrentGameScene(this).userInputManager.clearAllKeys(); this.tweens.add({ targets: this.gameReportElement, diff --git a/front/src/Phaser/UserInput/UserInputManager.ts b/front/src/Phaser/UserInput/UserInputManager.ts index f9389322..dd46a343 100644 --- a/front/src/Phaser/UserInput/UserInputManager.ts +++ b/front/src/Phaser/UserInput/UserInputManager.ts @@ -59,10 +59,14 @@ export class UserInputManager { ]; } - clearAllInputKeyboard(){ + clearAllListeners(){ this.Scene.input.keyboard.removeAllListeners(); } + clearAllKeys(){ + this.Scene.input.keyboard.removeAllKeys(); + } + getEventListForGameTick(): ActiveEventList { const eventsMap = new ActiveEventList(); this.KeysCode.forEach(d => { diff --git a/front/src/WebRtc/DiscussionManager.ts b/front/src/WebRtc/DiscussionManager.ts index 1bd488e9..235e124b 100644 --- a/front/src/WebRtc/DiscussionManager.ts +++ b/front/src/WebRtc/DiscussionManager.ts @@ -61,7 +61,7 @@ export class DiscussionManager { const inputMessage: HTMLInputElement = document.createElement('input'); inputMessage.onfocus = () => { if(this.userInputManager) { - this.userInputManager.clearAllInputKeyboard(); + this.userInputManager.clearAllKeys(); } } inputMessage.onblur = () => {