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

Remove jquery from input focus event

Browse Source
This commit is contained in:
Pavel Djundik 2019-11-07 12:31:51 +02:00
parent 80c6cfbd7c
commit 916da73108
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/js/keybinds.js
View File

@ -5,6 +5,7 @@ const Mousetrap = require("mousetrap");
const {vueApp} = require("./vue"); const {vueApp} = require("./vue");
const store = require("./store").default; const store = require("./store").default;
// Switch to the next/previous window in the channel list.
Mousetrap.bind(["alt+up", "alt+down"], function(e, keys) { Mousetrap.bind(["alt+up", "alt+down"], function(e, keys) {
const sidebar = $("#sidebar"); const sidebar = $("#sidebar");
const channels = sidebar.find(".chan").not(".network.collapsed :not(.lobby)"); const channels = sidebar.find(".chan").not(".network.collapsed :not(.lobby)");
@ -28,6 +29,7 @@ Mousetrap.bind(["alt+up", "alt+down"], function(e, keys) {
return false; return false;
}); });
// Switch to the next/previous lobby in the channel list
Mousetrap.bind(["alt+shift+up", "alt+shift+down"], function(e, keys) { Mousetrap.bind(["alt+shift+up", "alt+shift+down"], function(e, keys) {
const sidebar = $("#sidebar"); const sidebar = $("#sidebar");
const lobbies = sidebar.find(".lobby"); const lobbies = sidebar.find(".lobby");
@ -132,7 +134,7 @@ const ignoredKeys = {
224: true, // Meta 224: true, // Meta
}; };
$(document).on("keydown", (e) => { document.addEventListener("keydown", (e) => {
// Ignore any key that uses alt modifier // Ignore any key that uses alt modifier
// Ignore keys defined above // Ignore keys defined above
if (e.altKey || ignoredKeys[e.which]) { if (e.altKey || ignoredKeys[e.which]) {
@ -146,7 +148,12 @@ $(document).on("keydown", (e) => {
// Redirect pagedown/pageup keys to messages container so it scrolls // Redirect pagedown/pageup keys to messages container so it scrolls
if (e.which === 33 || e.which === 34) { if (e.which === 33 || e.which === 34) {
$("#windows .window.active .chan.active .chat").trigger("focus"); const chat = document.querySelector("#windows .chan.active .chat");
if (chat) {
chat.focus();
}
return; return;
} }
@ -157,16 +164,19 @@ $(document).on("keydown", (e) => {
return; return;
} }
const input = $("#input"); const input = document.getElementById("input");
if (!input) {
return;
}
input.focus();
// On enter, focus the input but do not propagate the event // On enter, focus the input but do not propagate the event
// This way, a new line is not inserted // This way, a new line is not inserted
if (e.which === 13) { if (e.which === 13) {
input.trigger("focus"); e.preventDefault();
return false;
} }
input.trigger("focus");
}); });
function scrollIntoViewNicely(el) { function scrollIntoViewNicely(el) {