Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-22 20:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix join channel UI opening by itself

Browse source 
Without this, `target` was matching all of the lobby link, the "Join a channel..." button, and the join form submit button. This change restricts to the first one.
This commit is contained in:
Jérémie Astori 2017-12-23 03:00:16 -05:00
parent 5490235f4d
commit 6c50fe72b9
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/js/socket-events/init.js
View file

@ -59,17 +59,17 @@ function openCorrectChannel(clientActive, serverActive) {
// Open last active channel
if (clientActive > 0) {
target = sidebar.find("[data-id='" + clientActive + "']");
target = sidebar.find(`.chan[data-id="${clientActive}"]`);
}
// Open window provided in location.hash
if (target.length === 0 && window.location.hash) {
target = $("#footer, #sidebar").find("[data-target='" + escape(window.location.hash) + "']");
target = $("#footer, #sidebar").find(`.chan[data-target="${escape(window.location.hash)}"]`);
}
// Open last active channel according to the server
if (serverActive > 0 && target.length === 0) {
target = sidebar.find("[data-id='" + serverActive + "']");
target = sidebar.find(`.chan[data-id="${serverActive}"]`);
}
// Open first available channel