deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-08 08:42:17 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1739 from thelounge/xpaw/inactive-scroll

Browse source 
Do not keep scroll to bottom in inactive channels
This commit is contained in:
Pavel Djundik 2017-11-26 11:40:50 +02:00 committed by GitHub
parent eaeb3375db 2f84b01427
commit 5ffeb04343
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client/js/renderPreview.js
View file

@ -4,6 +4,7 @@ const $ = require("jquery");
const options = require("./options");
const socket = require("./socket");
const templates = require("../views");
const chat = $("#chat");
const input = $("#input");
const Mousetrap = require("mousetrap");
@ -29,8 +30,11 @@ function renderPreview(preview, msg) {
preview.shown = preview.shown && options.shouldOpenMessagePreview(preview.type);
const container = msg.closest(".chat");
const channelId = container.data("id");
const activeChannelId = chat.find(".chan.active").data("id");
let bottom = false;
if (container.length) {
if (container.length && activeChannelId === channelId) {
bottom = container.isScrollBottom();
}
@ -41,11 +45,13 @@ function renderPreview(preview, msg) {
previewContainer
.append(templates.msg_preview({preview: preview}));
if (preview.shown && bottom) {
handleImageInPreview(msg.find(".toggle-content"), container);
}
if (activeChannelId === channelId) {
if (preview.shown && bottom) {
handleImageInPreview(msg.find(".toggle-content"), container);
}
container.trigger("keepToBottom");
container.trigger("keepToBottom");
}
}
$("#chat").on("click", ".text .toggle-button", function() {

4
client/js/socket-events/msg.js
View file

@ -46,7 +46,9 @@ function processReceivedMessage(data) {
data.msg
);
container.trigger("keepToBottom");
if (activeChannelId === targetId) {
container.trigger("keepToBottom");
}
notifyMessage(targetId, channel, data);