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

Merge pull request #1881 from thelounge/astorije/fix-join-channel-load 

Fix join channel UI opening by itself
This commit is contained in:
Pavel Djundik 2017-12-23 23:17:21 +02:00 committed by GitHub
parent 32a95c4d75 6c50fe72b9
commit 7c2422ee19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 // Open last active channel
if (clientActive > 0) { if (clientActive > 0) {
target = sidebar.find("[data-id='" + clientActive + "']"); target = sidebar.find(`.chan[data-id="${clientActive}"]`);
} }
// Open window provided in location.hash // Open window provided in location.hash
if (target.length === 0 && window.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 // Open last active channel according to the server
if (serverActive > 0 && target.length === 0) { if (serverActive > 0 && target.length === 0) {
target = sidebar.find("[data-id='" + serverActive + "']"); target = sidebar.find(`.chan[data-id="${serverActive}"]`);
} }
// Open first available channel // Open first available channel