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

Correctly updates new keymap abbrevation in SwitchKeymapActions (#270)

Browse Source 
Fixes #269
This commit is contained in:
József Farkas
2017-02-26 15:57:51 +01:00
committed by GitHub
parent 715b924be0
commit 9fcbac808b
6 changed files with 84 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shared/src/store/reducers/user-configuration.ts
View File

@@ -1,10 +1,11 @@
import '@ngrx/core/add/operator/select';
import { Action } from '@ngrx/store';
import 'rxjs/add/operator/map';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/of';
import 'rxjs/add/operator/map';
import { Helper as KeyActionHelper, KeyAction } from '../../config-serializer/config-items/key-action';
import { Helper as KeyActionHelper, KeyAction, SwitchKeymapAction } from '../../config-serializer/config-items/key-action';
import { Keymap } from '../../config-serializer/config-items/Keymap';
import { Macro } from '../../config-serializer/config-items/Macro';
import { UserConfiguration } from '../../config-serializer/config-items/UserConfiguration';
@@ -53,6 +54,8 @@ export default function (state = initialState, action: Action): UserConfiguratio
if (keymap.abbreviation === action.payload.abbr) {
keymap = Object.assign(new Keymap(), keymap);
keymap.abbreviation = abbr;
} else {
keymap = keymap.renameKeymap(action.payload.abbr, action.payload.newAbbr);
}
return keymap;