scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 23:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Access key name strings from a getter

Browse source
This commit is contained in:
Eric Rosenbaum 2018-05-01 09:01:36 -04:00
parent fbeaec600c
commit 85ac307261
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/io/keyboard.js
View file

@ -22,16 +22,16 @@ class Keyboard {
/** /**
* Names used for a set of special keys in Scratch. * Names used for a set of special keys in Scratch.
* @type {Array.<string>} * @type {ScratchKey}
*/ */
static get SPECIAL_KEY_NAMES () { static get KEY_NAMES () {
return [ return {
'space', SPACE: 'space',
'left arrow', LEFT: 'left arrow',
'up arrow', UP: 'up arrow',
'right arrow', RIGHT: 'right arrow',
'down arrow' DOWN: 'down arrow'
]; };
} }
/** /**
@ -43,15 +43,15 @@ class Keyboard {
keyString = Cast.toString(keyString); keyString = Cast.toString(keyString);
// Convert space and arrow keys to their Scratch key names. // Convert space and arrow keys to their Scratch key names.
switch (keyString) { switch (keyString) {
case ' ': return 'space'; case ' ': return Keyboard.KEY_NAMES.SPACE;
case 'ArrowLeft': case 'ArrowLeft':
case 'Left': return 'left arrow'; case 'Left': return Keyboard.KEY_NAMES.LEFT;
case 'ArrowUp': case 'ArrowUp':
case 'Up': return 'up arrow'; case 'Up': return Keyboard.KEY_NAMES.UP;
case 'Right': case 'Right':
case 'ArrowRight': return 'right arrow'; case 'ArrowRight': return Keyboard.KEY_NAMES.RIGHT;
case 'Down': case 'Down':
case 'ArrowDown': return 'down arrow'; case 'ArrowDown': return Keyboard.KEY_NAMES.DOWN;
} }
// Ignore modifier keys // Ignore modifier keys
if (keyString.length > 1) { if (keyString.length > 1) {
@ -74,18 +74,19 @@ class Keyboard {
return String.fromCharCode(keyArg); return String.fromCharCode(keyArg);
} }
switch (keyArg) { switch (keyArg) {
case 32: return 'space'; case 32: return Keyboard.KEY_NAMES.SPACE;
case 37: return 'left arrow'; case 37: return Keyboard.KEY_NAMES.LEFT;
case 38: return 'up arrow'; case 38: return Keyboard.KEY_NAMES.UP;
case 39: return 'right arrow'; case 39: return Keyboard.KEY_NAMES.RIGHT;
case 40: return 'down arrow'; case 40: return Keyboard.KEY_NAMES.DOWN;
} }
} }
keyArg = Cast.toString(keyArg); keyArg = Cast.toString(keyArg);
// If the arg matches a special key name, return it. // If the arg matches a special key name, return it.
if (Keyboard.SPECIAL_KEY_NAMES.includes(keyArg)) { const keyNameList = Object.values(Keyboard.KEY_NAMES);
if (keyNameList.includes(keyArg)) {
return keyArg; return keyArg;
} }
@ -96,7 +97,7 @@ class Keyboard {
// Check for the space character. // Check for the space character.
if (keyArg === ' ') { if (keyArg === ' ') {
return 'space'; return Keyboard.KEY_NAMES.SPACE;
} }
return keyArg.toUpperCase(); return keyArg.toUpperCase();