noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #731 from thecodingmachine/develop 

Deploy 2021-02-11 (3)
This commit is contained in:
grégoire parant 2021-02-11 21:56:08 +01:00 committed by GitHub
parent 0e8be106e5 b92b7304b0
commit f917420ca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/src/Administration/ConsoleGlobalMessageManager.ts
View File

@ -332,7 +332,7 @@ export class ConsoleGlobalMessageManager {
} }
active(){ active(){
this.userInputManager.clearAllInputKeyboard(); this.userInputManager.clearAllKeys();
this.divMainConsole.style.top = '0'; this.divMainConsole.style.top = '0';
this.activeConsole = true; this.activeConsole = true;
} }

2
front/src/Phaser/Game/GameScene.ts
View File

@ -1263,7 +1263,7 @@ export class GameScene extends ResizableScene implements CenterListener {
private bannedUser(){ private bannedUser(){
this.cleanupClosingScene(); this.cleanupClosingScene();
this.userInputManager.clearAllInputKeyboard(); this.userInputManager.clearAllKeys();
this.scene.start(ErrorSceneName, { this.scene.start(ErrorSceneName, {
title: 'Banned', title: 'Banned',
subTitle: 'You was banned of WorkAdventure', subTitle: 'You was banned of WorkAdventure',

2
front/src/Phaser/Menu/MenuScene.ts
View File

@ -269,7 +269,7 @@ export class MenuScene extends Phaser.Scene {
middleX = 0; middleX = 0;
} }
gameManager.getCurrentGameScene(this).userInputManager.clearAllInputKeyboard(); gameManager.getCurrentGameScene(this).userInputManager.clearAllKeys();
this.tweens.add({ this.tweens.add({
targets: this.gameReportElement, targets: this.gameReportElement,

6
front/src/Phaser/UserInput/UserInputManager.ts
View File

@ -59,10 +59,14 @@ export class UserInputManager {
]; ];
} }
clearAllInputKeyboard(){ clearAllListeners(){
this.Scene.input.keyboard.removeAllListeners(); this.Scene.input.keyboard.removeAllListeners();
} }
clearAllKeys(){
this.Scene.input.keyboard.removeAllKeys();
}
getEventListForGameTick(): ActiveEventList { getEventListForGameTick(): ActiveEventList {
const eventsMap = new ActiveEventList(); const eventsMap = new ActiveEventList();
this.KeysCode.forEach(d => { this.KeysCode.forEach(d => {

2
front/src/WebRtc/DiscussionManager.ts
View File

@ -61,7 +61,7 @@ export class DiscussionManager {
const inputMessage: HTMLInputElement = document.createElement('input'); const inputMessage: HTMLInputElement = document.createElement('input');
inputMessage.onfocus = () => { inputMessage.onfocus = () => {
if(this.userInputManager) { if(this.userInputManager) {
this.userInputManager.clearAllInputKeyboard(); this.userInputManager.clearAllKeys();
} }
} }
inputMessage.onblur = () => { inputMessage.onblur = () => {