mirror of
https://github.com/thelounge/thelounge.git
synced 2024-06-12 02:32:18 +02:00
5ce67ba093
Don't sort queries/users after special chans Set all users in tests to be of type query Add test for not inserting infront of lobby Break after finding the index, otherwise it always adds it to the end Add checking for lobby in first test Fix off-by-one error on the frontend Fix utterly idiotic issue adding a duplicate of the channel we are on rather than the new user when we query Check that we always insert before first special chan
38 lines
981 B
JavaScript
38 lines
981 B
JavaScript
"use strict";
|
|
|
|
const $ = require("jquery");
|
|
const socket = require("../socket");
|
|
const render = require("../render");
|
|
const chat = $("#chat");
|
|
const templates = require("../../views");
|
|
const sidebar = $("#sidebar");
|
|
|
|
socket.on("join", function(data) {
|
|
const id = data.network;
|
|
const network = sidebar.find(`#network-${id}`);
|
|
const channels = network.children();
|
|
const position = $(channels[data.index || channels.length - 1]); // Put channel in correct position, or the end if we don't have one
|
|
const sidebarEntry = templates.chan({
|
|
channels: [data.chan],
|
|
});
|
|
$(sidebarEntry).insertAfter(position);
|
|
chat.append(
|
|
templates.chat({
|
|
channels: [data.chan],
|
|
})
|
|
);
|
|
render.renderChannel(data.chan);
|
|
|
|
// Queries do not automatically focus, unless the user did a whois
|
|
if (data.chan.type === "query" && !data.shouldOpen) {
|
|
return;
|
|
}
|
|
|
|
sidebar.find(".chan")
|
|
.sort(function(a, b) {
|
|
return $(a).data("id") - $(b).data("id");
|
|
})
|
|
.last()
|
|
.trigger("click");
|
|
});
|