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

Merge pull request #1132 from PolarizedIons/fix-datemarker

Browse Source 
Fix date-marker not being removed on loading new messages
This commit is contained in:
Pavel Djundik 2017-05-05 21:05:10 +03:00 committed by GitHub
commit 328c61920e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
client/js/lounge.js
View File

@ -469,21 +469,21 @@ $(function() {
.find("#chan-" + data.chan) .find("#chan-" + data.chan)
.find(".messages"); .find(".messages");
// Remove the date-change marker we put at the top, because it may
// not actually be a date change now
var children = $(chan).children();
if (children.eq(0).hasClass("date-marker")) { // Check top most child
children.eq(0).remove();
} else if (children.eq(0).hasClass("unread-marker") && children.eq(1).hasClass("date-marker")) {
// Otherwise the date-marker would get 'stuck' because of the new-message marker
children.eq(1).remove();
}
// get the scrollable wrapper around messages // get the scrollable wrapper around messages
var scrollable = chan.closest(".chat"); var scrollable = chan.closest(".chat");
var heightOld = chan.height(); var heightOld = chan.height();
chan.prepend(documentFragment).end(); chan.prepend(documentFragment).end();
// Remove the date-change marker we put at the top, because it may
// not actually be a date change now
var children = $(chan).children();
if (children.eq(0).hasClass("date-marker-container")) { // Check top most child
children.eq(0).remove();
} else if (children.eq(1).hasClass("date-marker-container")) {
// The unread-marker could be at index 0, which will cause the date-marker to become "stuck"
children.eq(1).remove();
}
// restore scroll position // restore scroll position
var position = chan.height() - heightOld; var position = chan.height() - heightOld;
scrollable.scrollTop(position); scrollable.scrollTop(position);
@ -1364,8 +1364,8 @@ $(function() {
// Remove date-seperators that would otherwise be "stuck" at the top // Remove date-seperators that would otherwise be "stuck" at the top
// of the channel // of the channel
chan.find(".date-marker").each(function() { chan.find(".date-marker-container").each(function() {
if ($(this).next().hasClass("date-marker")) { if ($(this).next().hasClass("date-marker-container")) {
$(this).remove(); $(this).remove();
} }
}); });
@ -1376,7 +1376,7 @@ $(function() {
function clear() { function clear() {
chat.find(".active") chat.find(".active")
.find(".show-more").addClass("show").end() .find(".show-more").addClass("show").end()
.find(".messages .msg, .date-marker").remove(); .find(".messages .msg, .date-marker-container").remove();
} }
function completeNicks(word) { function completeNicks(word) {