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

Merge pull request #1517 from thelounge/xpaw/move-unread-in-history

Browse source 
Move unread marker when loading more history
This commit is contained in:
Al McKinlay 2017-09-16 20:51:55 +01:00 committed by GitHub
commit ec6307d55f
4 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/js/lounge.js
View file

@ -366,6 +366,7 @@ $(function() {
lastActiveChan lastActiveChan
.find(".unread-marker") .find(".unread-marker")
.data("unread-id", 0)
.appendTo(lastActiveChan.find(".messages")); .appendTo(lastActiveChan.find(".messages"));
var chan = $(target) var chan = $(target)

22
client/js/render.js
View file

@ -120,19 +120,25 @@ function renderChannelMessages(data) {
const documentFragment = buildChannelMessages(data.id, data.type, data.messages); const documentFragment = buildChannelMessages(data.id, data.type, data.messages);
const channel = chat.find("#chan-" + data.id + " .messages").append(documentFragment); const channel = chat.find("#chan-" + data.id + " .messages").append(documentFragment);
if (data.firstUnread > 0) { const template = $(templates.unread_marker());
const first = channel.find("#msg-" + data.firstUnread);
if (data.firstUnread > 0) {
let first = channel.find("#msg-" + data.firstUnread);
// TODO: If the message is far off in the history, we still need to append the marker into DOM
if (!first.length) { if (!first.length) {
channel.prepend(templates.unread_marker()); template.data("unread-id", data.firstUnread);
} else if (first.parent().hasClass("condensed")) { channel.prepend(template);
first.parent().before(templates.unread_marker());
} else { } else {
first.before(templates.unread_marker()); const parent = first.parent();
if (parent.hasClass("condensed")) {
first = parent;
}
first.before(template);
} }
} else { } else {
channel.append(templates.unread_marker()); channel.append(template);
} }
} }

24
client/js/socket-events/more.js
View file

@ -34,7 +34,29 @@ socket.on("more", function(data) {
// Add the older messages // Add the older messages
const documentFragment = render.buildChannelMessages(data.chan, type, data.messages); const documentFragment = render.buildChannelMessages(data.chan, type, data.messages);
chan.prepend(documentFragment).end(); chan.prepend(documentFragment);
// Move unread marker to correct spot if needed
const unreadMarker = chan.find(".unread-marker");
const firstUnread = unreadMarker.data("unread-id");
if (firstUnread > 0) {
let first = chan.find("#msg-" + firstUnread);
if (!first.length) {
chan.prepend(unreadMarker);
} else {
const parent = first.parent();
if (parent.hasClass("condensed")) {
first = parent;
}
unreadMarker.data("unread-id", 0);
first.before(unreadMarker);
}
}
// restore scroll position // restore scroll position
const position = chan.height() - heightOld; const position = chan.height() - heightOld;

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

@ -57,6 +57,7 @@ function processReceivedMessage(data) {
&& lastVisible.prev().hasClass("unread-marker"))) { && lastVisible.prev().hasClass("unread-marker"))) {
container container
.find(".unread-marker") .find(".unread-marker")
.data("unread-id", 0)
.appendTo(container); .appendTo(container);
} }