quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-17 05:58:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Normalize keymap internals" (#2225)

Browse source 
This reverts commit 751c06e437.
This commit is contained in:
CHaBou 2017-09-17 22:53:37 +02:00 committed by Timothy
parent 121d411855
commit e0d793eeeb
4 changed files with 5 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/config/keymaps.js
View file

@ -1,5 +1,4 @@
const {readFileSync} = require('fs'); const {readFileSync} = require('fs');
const {normalize} = require('../utils/keymaps-normalize');
const {defaultPlatformKeyPath} = require('./paths'); const {defaultPlatformKeyPath} = require('./paths');
const commands = {}; const commands = {};
@ -8,7 +7,7 @@ const keys = {};
const _setKeysForCommands = function (keymap) { const _setKeysForCommands = function (keymap) {
for (const command in keymap) { for (const command in keymap) {
if (command) { if (command) {
commands[command] = normalize(keymap[command]); commands[command] = keymap[command].toLowerCase();
} }
} }
}; };
@ -36,8 +35,8 @@ const _extend = function (customsKeys) {
if (customsKeys) { if (customsKeys) {
for (const command in customsKeys) { for (const command in customsKeys) {
if (command) { if (command) {
commands[command] = normalize(customsKeys[command]); commands[command] = customsKeys[command];
keys[normalize(customsKeys[command])] = command; keys[customsKeys[command]] = command;
} }
} }
} }

23
app/utils/keymaps-normalize.js
View file

@ -1,23 +0,0 @@
const {getKeymaps} = require('../config/keymaps');
const normalize = keybinding => {
function sortAlphabetically(a, b) {
return a.localeCompare(b);
}
return keybinding.toLowerCase().split('+').sort(sortAlphabetically).join('+');
};
const findCommandByKeys = (keys, commands) => {
return commands[normalize(keys)];
};
const getCommand = keys => {
return findCommandByKeys(keys, getKeymaps().keys);
};
module.exports = {
normalize,
findCommandByKeys,
getCommand
};

4
lib/utils/keymaps.js
View file

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

64
test/unit/keymaps-normalize.test.js
View file

@ -1,64 +0,0 @@
import test from 'ava';
import {findCommandByKeys} from '../../app/utils/keymaps-normalize';
const expectedCommand = 'test-command';
const expectedLocalizedCommand = 'test-localized-command';
const commands = {
'alt+p+shift': expectedCommand,
'ç+cmd+ctrl': expectedLocalizedCommand
};
test(`returns a command`, t => {
t.is(
findCommandByKeys('alt+shift+p', commands),
expectedCommand
);
t.is(
findCommandByKeys('shift+p+alt', commands),
expectedCommand
);
t.is(
findCommandByKeys('p+alt+shift', commands),
expectedCommand
);
t.is(
findCommandByKeys('alt+shift+P', commands),
expectedCommand
);
t.is(
findCommandByKeys('Shift+P+Alt', commands),
expectedCommand
);
});
test(`returns a localized command`, t => {
t.is(
findCommandByKeys('cmd+ctrl+ç', commands),
expectedLocalizedCommand
);
t.is(
findCommandByKeys('ç+cmd+ctrl', commands),
expectedLocalizedCommand
);
t.is(
findCommandByKeys('ctrl+ç+cmd', commands),
expectedLocalizedCommand
);
t.is(
findCommandByKeys('ctrl+Ç+cmd', commands),
expectedLocalizedCommand
);
t.is(
findCommandByKeys('Cmd+Ctrl+Ç', commands),
expectedLocalizedCommand
);
});