Skip to content

Commit e3fc37c

Browse files
committed
fix earlier mistake in inCode
1 parent e01add6 commit e3fc37c

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

src/events/keyboard.js

+4-19
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77
export function isCode(input) {
88
const leftRightKeys = [
9-
'AltLeft', 'AltRight',
10-
'ShiftLeft', 'ShiftRight',
11-
'ControlLeft', 'ControlRight',
12-
'MetaLeft', 'MetaRight',
9+
'Alt',
10+
'Shift',
11+
'Control',
12+
'Meta',
1313
];
1414
if (leftRightKeys.includes(input)) {
1515
return false;
@@ -924,21 +924,6 @@ function keyboard(p5, fn){
924924
* </code>
925925
* </div>
926926
*/
927-
function isCode(input) {
928-
const leftRightKeys = [
929-
'AltLeft', 'AltRight',
930-
'ShiftLeft', 'ShiftRight',
931-
'ControlLeft', 'ControlRight',
932-
'MetaLeft', 'MetaRight',
933-
];
934-
if (leftRightKeys.includes(input)) {
935-
return false;
936-
}
937-
if (typeof input !== 'string') {
938-
return false;
939-
}
940-
return input.length > 1;
941-
}
942927

943928
fn.keyIsDown = function(input) {
944929
if (isCode(input)) {

test/unit/events/keyboard.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -183,16 +183,16 @@ suite('Keyboard Events', function() {
183183
});
184184

185185
test('returns true for multi-character strings', function() {
186-
assert.isTrue(isCode('Enter'));
186+
assert.isTrue(isCode('ShiftLeft'));
187187
assert.isTrue(isCode('ArrowUp'));
188-
assert.isTrue(isCode('Shift'));
189-
assert.isTrue(isCode('Control'));
190188
assert.isTrue(isCode('ab'));
191189
});
192190

193-
test('returns false for strings for letright keys', function() {
194-
assert.isFalse(isCode('AltLeft'));
195-
assert.isFalse(isCode('ShiftRight'));
191+
test('returns false/true for apppropriate leftright keys and codes', function() {
192+
assert.isFalse(isCode('Alt'));
193+
assert.isFalse(isCode('Shift'));
194+
assert.isTrue(isCode('AltLeft'));
195+
assert.isTrue(isCode('ShiftLeft'));
196196
});
197197

198198
test('handles edge cases correctly', function() {

0 commit comments

Comments
 (0)