Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix buggy calculations of which messages get a footer. 

(imported from commit 14c942e8297b2385690bb3e679cca729afd9c52b)
This commit is contained in:
Tim Abbott 2013-06-28 12:05:33 -04:00
parent b62d7acbc7
commit a237963c90
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zephyr/static/js/message_list.js
View File

@ -298,6 +298,8 @@ MessageList.prototype = {
if (util.same_recipient(prev, message) && self.collapse_messages &&
prev.historical === message.historical && !message.show_date) {
current_group.push(message.id);
// prev is no longer the last element in this block
prev.include_footer = false;
} else {
if (current_group.length > 0)
new_message_groups.push(current_group);
@ -306,8 +308,8 @@ MessageList.prototype = {
// Add a space to the table, but not for the first element.
message.include_recipient = true;
message.include_bookend = (prev !== undefined);
if (prev) {
prev.include_footer = message.include_bookend;
if (prev !== undefined) {
prev.include_footer = true;
}
message.subscribed = false;
message.unsubscribed = false;
@ -393,9 +395,13 @@ MessageList.prototype = {
var row = rows.get(last_message_id, table_name);
if (ids_where_next_is_same_sender[last_message_id]) {
row.find('.messagebox').addClass("next_is_same_sender");
if (this.get(last_message_id) && this.get(last_message_id).include_footer) {
row.removeClass('last_message');
}
}
// We didn't actually rerender the original last message,
// but we might have set .include_footer=false for it in
// the above loop since it was the previous message for
// messages[0]. If so, we need to update the DOM.
if (this.get(last_message_id) && ! this.get(last_message_id).include_footer) {
row.removeClass('last_message');
}
}