Merge branch 'master' into v2

This commit is contained in:
CHaBou 2017-09-17 23:08:33 +02:00
commit f8c19b0ef2
No known key found for this signature in database
GPG key ID: EF8D073B729A0B33
5 changed files with 21 additions and 71 deletions

View file

@ -1,6 +1,6 @@
import {remote} from 'electron';
const {getCommand} = remote.require('./utils/keymaps-normalize');
const {getKeymaps} = remote.require('./config');
export default function returnKey(e) {
let keys = [];
@ -30,5 +30,5 @@ export default function returnKey(e) {
}
keys = keys.join('+');
return getCommand(keys);
return getKeymaps().keys[keys.toLowerCase()];
}