deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-17 13:46:36 +02:00
Code Issues Projects Releases Wiki Activity

Fix types in client/keybinds

Browse source
This commit is contained in:
Max Leiter 2022-05-31 13:48:29 -07:00
parent afba008363
commit 96aa50c673
No known key found for this signature in database
GPG key ID: A3512F2F2F17EBDA
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/js/helpers/ircmessageparser/findNames.ts
View file

@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/restrict-plus-operands */
import {Part} from "./merge";
const nickRegExp = /([\w[\]\\`^{|}-]+)/g;

17
client/js/keybinds.ts
View file

@ -5,6 +5,7 @@ import {switchToChannel, router, navigate} from "./router";
import isChannelCollapsed from "./helpers/isChannelCollapsed";
import isIgnoredKeybind from "./helpers/isIgnoredKeybind";
import listenForTwoFingerSwipes from "./helpers/listenForTwoFingerSwipes";
import {ClientChan} from "./types";
// Switch to the next/previous window in the channel list.
Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
@ -17,18 +18,18 @@ Mousetrap.bind(["alt+up", "alt+down"], function (e, keys) {
return false;
});
listenForTwoFingerSwipes(function (cardinalDirection) {
listenForTwoFingerSwipes(function (cardinalDirection: string) {
if (cardinalDirection === "e" || cardinalDirection === "w") {
navigateWindow(cardinalDirection === "e" ? -1 : 1);
}
});
function navigateWindow(direction) {
function navigateWindow(direction: number) {
if (store.state.networks.length === 0) {
return;
}
const flatChannels = [];
const flatChannels: ClientChan[] = [];
let index = -1;
for (const network of store.state.networks) {
@ -116,12 +117,12 @@ Mousetrap.bind(["alt+a"], function (e) {
});
// Show the help menu.
Mousetrap.bind(["alt+/"], function (e) {
Mousetrap.bind(["alt+/"], async function (e) {
if (isIgnoredKeybind(e)) {
return true;
}
navigate("Help");
await navigate("Help");
return false;
});
@ -176,7 +177,7 @@ const ignoredKeys = {
document.addEventListener("keydown", (e) => {
// Allow navigating back to the previous page when on the help screen.
if (e.key === "Escape" && router.currentRoute.name === "Help") {
if (e.key === "Escape" && router.currentRoute.value.name === "Help") {
router.go(-1);
return;
}
@ -197,13 +198,13 @@ document.addEventListener("keydown", (e) => {
const chat = document.querySelector(".window .chat-content .chat");
if (chat) {
chat.focus();
(chat as HTMLDivElement).focus();
}
return;
}
const tagName = e.target.tagName;
const tagName = (e.target as HTMLElement).tagName;
// Ignore if we're already typing into <input> or <textarea>
if (tagName === "INPUT" || tagName === "TEXTAREA") {

2
test/fixtures/.thelounge/sts-policies.json vendored
View file

@ -3,6 +3,6 @@
"host": "irc.example.com",
"port": 7000,
"duration": 3600,
"expires": 1654030493590
"expires": 1654033556780
}
]