Merge pull request #1844 from thelounge/astorije/mousetrap-mod

Use cross-platform modifier shortcut for Mousetrap when possible
This commit is contained in:
Jérémie Astori 2017-12-16 16:26:44 -05:00 committed by GitHub
commit bf602db991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,10 +37,8 @@ Mousetrap.bind([
}); });
Mousetrap.bind([ Mousetrap.bind([
"command+up", "mod+up",
"command+down", "mod+down",
"ctrl+up",
"ctrl+down",
], function(e, keys) { ], function(e, keys) {
const channels = sidebar.find(".chan"); const channels = sidebar.find(".chan");
const index = channels.index(channels.filter(".active")); const index = channels.index(channels.filter(".active"));
@ -77,10 +75,7 @@ const colorsHotkeys = {
}; };
for (const hotkey in colorsHotkeys) { for (const hotkey in colorsHotkeys) {
Mousetrap.bind([ Mousetrap.bind("mod+" + hotkey, function(e) {
"command+" + hotkey,
"ctrl+" + hotkey,
], function(e) {
e.preventDefault(); e.preventDefault();
const cursorPosStart = input.prop("selectionStart"); const cursorPosStart = input.prop("selectionStart");