From 6041e492ee1b0c2fd2120e14d1ccd2261e14ab8d Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Tue, 19 Sep 2017 18:01:02 +0300 Subject: [PATCH] Fix history not loading if first message is condensed --- client/js/socket-events/more.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/js/socket-events/more.js b/client/js/socket-events/more.js index d762b542..fafbfc20 100644 --- a/client/js/socket-events/more.js +++ b/client/js/socket-events/more.js @@ -79,11 +79,11 @@ socket.on("more", function(data) { chat.on("click", ".show-more-button", function() { const self = $(this); - const lastMessage = self.closest(".chat").find(".msg").first(); + const lastMessage = self.closest(".chat").find(".msg:not(.condensed)").first(); let lastMessageId = -1; if (lastMessage.length > 0) { - lastMessageId = parseInt(lastMessage[0].id.replace("msg-", ""), 10); + lastMessageId = parseInt(lastMessage.attr("id").replace("msg-", ""), 10); } self