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

Add a keyboard handler to close the join form when hitting "Escape"

Browse source
This commit is contained in:
Jérémie Astori 2017-12-21 15:40:50 -05:00
parent 9ea3966140
commit d2b0385431
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client/js/join-channel.js
View file

@ -1,12 +1,20 @@
"use strict";
const $ = require("jquery");
const Mousetrap = require("mousetrap");
const socket = require("./socket");
const utils = require("./utils");
const sidebar = $("#sidebar");
function closeForm(network) {
const form = network.find(".join-form");
form.find("input[name='channel']").val("");
form.find("input[name='key']").val("");
form.hide();
}
sidebar.on("click", ".add-channel", (e) => {
const id = $(e.target).data("id");
const joinForm = $(`#join-channel-${id}`);
@ -30,8 +38,13 @@ sidebar.on("submit", ".join-form", function() {
target: form.prev().data("id"),
});
}
channel.val("");
key.val("");
form.hide();
closeForm(form.closest(".network"));
return false;
});
exports.handleKeybinds = function() {
sidebar.find(".join-form input, .join-form button").each(function() {
const network = $(this).closest(".network");
Mousetrap(this).bind("esc", () => closeForm(network));
});
};

4
client/js/render.js
View file

@ -8,6 +8,7 @@ const utils = require("./utils");
const sorting = require("./sorting");
const constants = require("./constants");
const condensed = require("./condensed");
const JoinChannel = require("./join-channel");
const helpers_parse = require("./libs/handlebars/parse");
const chat = $("#chat");
@ -183,6 +184,9 @@ function renderNetworks(data, singleNetwork) {
})
);
// Add keyboard handlers to the "Join a channel…" form inputs/button
JoinChannel.handleKeybinds();
let newChannels;
const channels = $.map(data.networks, function(n) {
return n.channels;