From a8a659dadd375dcb7deb62599d9c812961b7dc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Farkas?= Date: Sun, 11 Jun 2017 17:04:03 +0200 Subject: [PATCH] Fix keystroke selection when additional field is given but no scancode (#306) --- .../popover/tab/keypress/keypress-tab.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/shared/src/components/popover/tab/keypress/keypress-tab.component.ts b/shared/src/components/popover/tab/keypress/keypress-tab.component.ts index 5b2d15da..e6e2e691 100644 --- a/shared/src/components/popover/tab/keypress/keypress-tab.component.ts +++ b/shared/src/components/popover/tab/keypress/keypress-tab.component.ts @@ -212,12 +212,14 @@ export class KeypressTabComponent extends Tab implements OnChanges { let scanCode: number; let type: string; if (option.additional) { - scanCode = option.additional.scancode ? option.additional.scancode : 0; + scanCode = option.additional.scancode; type = option.additional.type || 'basic'; } else { - scanCode = +option.id; type = 'basic'; } + if (scanCode === undefined) { + scanCode = +option.id; + } return [scanCode, type]; }