Skip to content

Commit 23e2855

Browse files
Fix keyboard handler
1 parent d3921f8 commit 23e2855

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

‎src/index.js‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,15 @@ AFRAME.registerSystem('input-mapping', {
202202

203203
keyboardHandler: function (event) {
204204
this.checkValidInputMapping();
205-
if (mappings && mappings.keyboard) {
206-
mappings = mappings.keyboard;
207-
var key = event.keyCode === 32 ? 'Space' : event.key;
208-
var keyEvent = (key + '_' + event.type.substr(3)).toLowerCase();
209-
var mapEvent = mappings[keyEvent];
205+
if (AFRAME.inputMappings &&
206+
AFRAME.inputMappings.mappings[AFRAME.currentInputMapping] &&
207+
AFRAME.inputMappings.mappings[AFRAME.currentInputMapping].keyboard
208+
) {
209+
var currentKeyboardMapping =
210+
AFRAME.inputMappings.mappings[AFRAME.currentInputMapping].keyboard;
211+
var key = event.keyCode === 32 ? "Space" : event.key;
212+
var keyEvent = (key + "_" + event.type.substr(3)).toLowerCase();
213+
var mapEvent = currentKeyboardMapping[keyEvent];
210214
if (mapEvent) {
211215
this.sceneEl.emit(mapEvent);
212216
}

0 commit comments

Comments
 (0)