supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3343 from thelounge/xpaw/fix-formatting

Browse Source 
Fix formatting hotkeys on non english locales
This commit is contained in:
Pavel Djundik 2019-08-03 22:14:31 +03:00 committed by GitHub
commit b8948856f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
client/components/ChatInput.vue
View File

@ -49,13 +49,13 @@ const Mousetrap = require("mousetrap");
const {wrapCursor} = require("undate"); const {wrapCursor} = require("undate");
const formattingHotkeys = { const formattingHotkeys = {
k: "\x03", "mod+k": "\x03",
b: "\x02", "mod+b": "\x02",
u: "\x1F", "mod+u": "\x1F",
i: "\x1D", "mod+i": "\x1D",
o: "\x0F", "mod+o": "\x0F",
s: "\x1e", "mod+s": "\x1e",
m: "\x11", "mod+m": "\x11",
}; };
// Autocomplete bracket and quote characters like in a modern IDE // Autocomplete bracket and quote characters like in a modern IDE
@ -91,24 +91,21 @@ export default {
const inputTrap = Mousetrap(this.$refs.input); const inputTrap = Mousetrap(this.$refs.input);
for (const hotkey in formattingHotkeys) { inputTrap.bind(Object.keys(formattingHotkeys), function(e, key) {
inputTrap.bind("mod+" + hotkey, function(e) { const modifier = formattingHotkeys[key];
// Key is lowercased because keybinds also get processed if caps lock is on
const modifier = formattingHotkeys[e.key.toLowerCase()];
wrapCursor( wrapCursor(
e.target, e.target,
modifier, modifier,
e.target.selectionStart === e.target.selectionEnd ? "" : modifier e.target.selectionStart === e.target.selectionEnd ? "" : modifier
); );
return false; return false;
}); });
}
inputTrap.bind(Object.keys(bracketWraps), function(e) { inputTrap.bind(Object.keys(bracketWraps), function(e, key) {
if (e.target.selectionStart !== e.target.selectionEnd) { if (e.target.selectionStart !== e.target.selectionEnd) {
wrapCursor(e.target, e.key, bracketWraps[e.key]); wrapCursor(e.target, key, bracketWraps[key]);
return false; return false;
} }