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

is_me_message is an attribute of the message not the message_container 

(imported from commit db36e529de92a82bb9c5df97030833ca2e3e0f80)
This commit is contained in:
Jason Michalski 2014-03-19 11:43:32 -04:00
parent 536449c6a4
commit 94279c0522
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/message_list_view.js
View File

@ -225,7 +225,7 @@ MessageListView.prototype = {
// Join two groups into one. // Join two groups into one.
if (this.collapse_messages && same_recipient(last_msg_container, first_msg_container) && same_day(last_msg_container, first_msg_container) && (last_msg_container.msg.historical === first_msg_container.msg.historical)) { if (this.collapse_messages && same_recipient(last_msg_container, first_msg_container) && same_day(last_msg_container, first_msg_container) && (last_msg_container.msg.historical === first_msg_container.msg.historical)) {
if (!last_msg_container.status_message && !first_msg_container.is_me_message && same_sender(last_msg_container, first_msg_container)) { if (!last_msg_container.status_message && !first_msg_container.msg.is_me_message && same_sender(last_msg_container, first_msg_container)) {
first_msg_container.include_sender = false; first_msg_container.include_sender = false;
} }
if (same_sender(last_msg_container, first_msg_container)) { if (same_sender(last_msg_container, first_msg_container)) {

2
zerver/tests/frontend/node/message_list_view.js
View File

@ -207,7 +207,7 @@ set_global('unread', {message_unread: function () {}});
message1 message1
]); ]);
var message2 = build_message_context({}, {is_me_message: true}); var message2 = build_message_context({is_me_message: true});
var message_group2 = build_message_group([ var message_group2 = build_message_group([
message2 message2
]); ]);