Merge branch 'master' into canary

This commit is contained in:
CHaBou 2017-09-20 01:39:55 +02:00
commit d3cd9aee00
No known key found for this signature in database
GPG key ID: EF8D073B729A0B33
7 changed files with 84 additions and 5 deletions

View file

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