From 94279c052225247ad7528cdbb8122d94b10207c2 Mon Sep 17 00:00:00 2001 From: Jason Michalski Date: Wed, 19 Mar 2014 11:43:32 -0400 Subject: [PATCH] is_me_message is an attribute of the message not the message_container (imported from commit db36e529de92a82bb9c5df97030833ca2e3e0f80) --- static/js/message_list_view.js | 2 +- zerver/tests/frontend/node/message_list_view.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/message_list_view.js b/static/js/message_list_view.js index 54d4b52930..a8717e0f0a 100644 --- a/static/js/message_list_view.js +++ b/static/js/message_list_view.js @@ -225,7 +225,7 @@ MessageListView.prototype = { // 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 (!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; } if (same_sender(last_msg_container, first_msg_container)) { diff --git a/zerver/tests/frontend/node/message_list_view.js b/zerver/tests/frontend/node/message_list_view.js index d9268b9060..5e64f454fc 100644 --- a/zerver/tests/frontend/node/message_list_view.js +++ b/zerver/tests/frontend/node/message_list_view.js @@ -207,7 +207,7 @@ set_global('unread', {message_unread: function () {}}); 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([ message2 ]);