uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove magic numbers in KeypressTabComponent.

Browse Source
This commit is contained in:
József Farkas
2016-08-08 21:56:02 +02:00
parent ffce89023c
commit 940ce6bcae
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/popover/tab/keypress/keypress-tab.component.ts
+10 -5
View File
@@ -41,8 +41,8 @@ export class KeypressTabComponent implements OnInit, Tab {
}]; }];
this.scanCodeGroups = this.scanCodeGroups.concat(require('json!./scancodes.json')); this.scanCodeGroups = this.scanCodeGroups.concat(require('json!./scancodes.json'));
this.longPressGroups = require('json!./longPress.json'); this.longPressGroups = require('json!./longPress.json');
this.leftModifierSelects = Array(4).fill(false); this.leftModifierSelects = Array(this.leftModifiers.length).fill(false);
this.rightModifierSelects = Array(4).fill(false); this.rightModifierSelects = Array(this.rightModifiers.length).fill(false);
this.selectedLongPressIndex = -1; this.selectedLongPressIndex = -1;
} }
@@ -65,12 +65,17 @@ export class KeypressTabComponent implements OnInit, Tab {
// Restore scancode // Restore scancode
this.scanCode = keystrokeAction.scancode || 0; this.scanCode = keystrokeAction.scancode || 0;
let leftModifiersLength: number = this.leftModifiers.length;
// Restore modifiers // Restore modifiers
for (let i = 0; i < this.leftModifierSelects.length; ++i) { for (let i = 0; i < leftModifiersLength; ++i) {
this.leftModifierSelects[this.modifierMapper(i)] = ((keystrokeAction.modifierMask >> i) & 1) === 1; this.leftModifierSelects[this.modifierMapper(i)] = ((keystrokeAction.modifierMask >> i) & 1) === 1;
} }
for (let i = 4; i < 4 + this.rightModifierSelects.length; ++i) {
this.rightModifierSelects[this.modifierMapper(i) - 4] = ((keystrokeAction.modifierMask >> i) & 1) === 1; for (let i = leftModifiersLength; i < leftModifiersLength + this.rightModifierSelects.length; ++i) {
let index: number = this.modifierMapper(i) - leftModifiersLength;
this.rightModifierSelects[index] = ((keystrokeAction.modifierMask >> i) & 1) === 1;
} }
// Restore longPressAction // Restore longPressAction