paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 00:18:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate the global message data from the list display data

Browse Source 
The messages being passed to the handlebars templates were global
messages which we were adding per list details to, show name bar etc.
This causes rendering bugs when you try to rerender a message, because a
different list may have changed it. This commit moves the global message
data to a msg attribute on the message_container which will contain the
per list attributes.

(imported from commit 26b1f0d2c72d6288a6d3e7ed5f8692426f2a97ad)
This commit is contained in:
Jason Michalski
2014-03-14 11:28:54 -04:00
parent c39e657a3b
commit 1613cad6f6
5 changed files with 119 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,16 +21,18 @@ set_global('unread', {message_unread: function () {}});
if (message === undefined) {
message = {};
}
return _.defaults(message, {
id: _.uniqueId('test_message_'),
status_message: false,
type: 'stream',
stream: 'Test Stream 1',
subject: 'Test Subject 1',
sender_email: 'test@example.com',
timestamp: _.uniqueId(),
include_sender: true
});
return {
msg: _.defaults(message, {
id: _.uniqueId('test_message_'),
status_message: false,
type: 'stream',
stream: 'Test Stream 1',
subject: 'Test Subject 1',
sender_email: 'test@example.com',
timestamp: _.uniqueId(),
include_sender: true
})
};
}
function build_message_group(messages) {
@@ -53,14 +55,17 @@ set_global('unread', {message_unread: function () {}});
function assert_message_list_equal(list1, list2) {
assert.deepEqual(
_.pluck(list1, 'id'),
_.pluck(list2, 'id')
_.chain(list1).pluck('msg').pluck('id').value(),
_.chain(list2).pluck('msg').pluck('id').value()
);
}
function assert_message_groups_list_equal(list1, list2) {
function extract_message_ids(message_group) {
return _.pluck(message_group.messages, 'id');
return _.chain(message_group.messages)
.pluck('msg')
.pluck('id')
.value();
}
assert.deepEqual(
_.map(list1, extract_message_ids),