Skip to content

Commit 1d85795

Browse files
committed
Listen for the new Events
1 parent f9167d5 commit 1d85795

6 files changed

Lines changed: 16 additions & 10 deletions

File tree

src/input/InputManager.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ var Class = require('../utils/Class');
88
var CONST = require('./const');
99
var EventEmitter = require('eventemitter3');
1010
var Events = require('./events');
11+
var GameEvents = require('../core/events');
1112
var Keyboard = require('./keyboard/KeyboardManager');
1213
var Mouse = require('./mouse/MouseManager');
1314
var Pointer = require('./Pointer');
@@ -383,7 +384,7 @@ var InputManager = new Class({
383384
*/
384385
this._tempMatrix2 = new TransformMatrix();
385386

386-
game.events.once('boot', this.boot, this);
387+
game.events.once(GameEvents.BOOT, this.boot, this);
387388
},
388389

389390
/**
@@ -403,9 +404,9 @@ var InputManager = new Class({
403404

404405
this.events.emit(Events.MANAGER_BOOT);
405406

406-
this.game.events.on('prestep', this.update, this);
407-
this.game.events.on('poststep', this.postUpdate, this);
408-
this.game.events.once('destroy', this.destroy, this);
407+
this.game.events.on(GameEvents.PRE_STEP, this.update, this);
408+
this.game.events.on(GameEvents.POST_STEP, this.postUpdate, this);
409+
this.game.events.once(GameEvents.DESTROY, this.destroy, this);
409410
},
410411

411412
/**

src/input/keyboard/KeyboardManager.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
var ArrayRemove = require('../../utils/array/Remove');
88
var Class = require('../../utils/Class');
9+
var GameEvents = require('../../core/events');
10+
var InputEvents = require('..//events');
911
var KeyCodes = require('../../input/keyboard/keys/KeyCodes');
1012
var NOOP = require('../../utils/Class');
1113

@@ -138,7 +140,7 @@ var KeyboardManager = new Class({
138140
*/
139141
this.onKeyUp = NOOP;
140142

141-
inputManager.events.once('boot', this.boot, this);
143+
inputManager.events.once(InputEvents.MANAGER_BOOT, this.boot, this);
142144
},
143145

144146
/**
@@ -167,7 +169,7 @@ var KeyboardManager = new Class({
167169
this.startListeners();
168170
}
169171

170-
this.manager.game.events.on('poststep', this.postUpdate, this);
172+
this.manager.game.events.on(GameEvents.POST_STEP, this.postUpdate, this);
171173
},
172174

173175
/**

src/input/keyboard/combo/KeyCombo.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ var ResetKeyCombo = require('./ResetKeyCombo');
5656
* @class KeyCombo
5757
* @memberof Phaser.Input.Keyboard
5858
* @constructor
59+
* @listens Phaser.Input.Keyboard.Events#ANY_KEY_DOWN
5960
* @since 3.0.0
6061
*
6162
* @param {Phaser.Input.Keyboard.KeyboardPlugin} keyboardPlugin - A reference to the Keyboard Plugin.
@@ -260,7 +261,7 @@ var KeyCombo = new Class({
260261
*/
261262
this.onKeyDown = onKeyDownHandler;
262263

263-
this.manager.on('keydown', onKeyDownHandler);
264+
this.manager.on(Events.ANY_KEY_DOWN, onKeyDownHandler);
264265
},
265266

266267
/**

src/input/keyboard/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
module.exports = {
1212

13-
Events: require('./events');
13+
Events: require('./events'),
1414

1515
KeyboardManager: require('./KeyboardManager'),
1616
KeyboardPlugin: require('./KeyboardPlugin'),

src/input/mouse/MouseManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
var Class = require('../../utils/Class');
88
var Features = require('../../device/Features');
9+
var InputEvents = require('../events');
910
var NOOP = require('../../utils/Class');
1011

1112
// https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent
@@ -148,7 +149,7 @@ var MouseManager = new Class({
148149
*/
149150
this.pointerLockChange = NOOP;
150151

151-
inputManager.events.once('boot', this.boot, this);
152+
inputManager.events.once(InputEvents.MANAGER_BOOT, this.boot, this);
152153
},
153154

154155
/**

src/input/touch/TouchManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
var Class = require('../../utils/Class');
8+
var InputEvents = require('../events');
89
var NOOP = require('../../utils/NOOP');
910

1011
// https://developer.mozilla.org/en-US/docs/Web/API/Touch_events
@@ -132,7 +133,7 @@ var TouchManager = new Class({
132133
*/
133134
this.onTouchOut = NOOP;
134135

135-
inputManager.events.once('boot', this.boot, this);
136+
inputManager.events.once(InputEvents.MANAGER_BOOT, this.boot, this);
136137
},
137138

138139
/**

0 commit comments

Comments
 (0)