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

fix: SwitchKeymapAction not allow to refer to itself (#694)

Browse Source
This commit is contained in:
Róbert Kiss
2018-06-24 20:32:32 +02:00
committed by László Monda
parent 0aa9c73b4b
commit 94cfd9d2e9
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/uhk-web/src/app/store/reducers/user-configuration.ts
View File

@@ -13,6 +13,7 @@ import {
Module, Module,
NoneAction, NoneAction,
PlayMacroAction, PlayMacroAction,
SwitchKeymapAction,
SwitchLayerAction, SwitchLayerAction,
UserConfiguration UserConfiguration
} from 'uhk-common'; } from 'uhk-common';
@@ -143,8 +144,14 @@ export function reducer(state = initialState, action: Action & { payload?: any }
const newKeyAction = keyActionRemap.action; const newKeyAction = keyActionRemap.action;
const newKeymap: Keymap = action.payload.keymap; const newKeymap: Keymap = action.payload.keymap;
const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction; const isSwitchLayerAction = newKeyAction instanceof SwitchLayerAction;
const isSwitchKeymapAction = newKeyAction instanceof SwitchKeymapAction;
changedUserConfiguration.keymaps = state.keymaps.map(keymap => { changedUserConfiguration.keymaps = state.keymaps.map(keymap => {
// SwitchKeymapAction not allow to refer to itself
if (isSwitchKeymapAction && keymap.abbreviation === newKeyAction.keymapAbbreviation) {
return keymap;
}
if (keyActionRemap.remapOnAllKeymap || keymap.abbreviation === newKeymap.abbreviation) { if (keyActionRemap.remapOnAllKeymap || keymap.abbreviation === newKeymap.abbreviation) {
keymap = new Keymap(keymap); keymap = new Keymap(keymap);