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

ui_init: Pass params to pm_conversations.recent.

Browse Source 
This is follow up to da79fd206a

I accidentally skipped over pm_conversations.  Same
ideas as the bigger previous commit--we pass in params
to the initialize function and do the delete cleanup
within ui_init.
This commit is contained in:
Steve Howell
2020-02-26 22:36:38 +00:00
committed by Tim Abbott
parent 56c03e1311
commit c32b4d098f
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/pm_conversations.js
View File

@@ -16,7 +16,7 @@ run_test('partners', () => {
zrequire("people"); zrequire("people");
run_test('insert_recent_private_message', () => { run_test('insert_recent_private_message', () => {
set_global('page_params', { const params = {
recent_private_conversations: [ recent_private_conversations: [
{user_ids: [11, 2], {user_ids: [11, 2],
max_message_id: 150, max_message_id: 150,
@@ -28,9 +28,9 @@ run_test('insert_recent_private_message', () => {
max_message_id: 7, max_message_id: 7,
}, },
], ],
}); };
people.initialize_current_user(15); people.initialize_current_user(15);
pmc.recent.initialize(); pmc.recent.initialize(params);
assert.deepEqual(pmc.recent.get(), [ assert.deepEqual(pmc.recent.get(), [
{user_ids_string: '2,11', max_message_id: 150}, {user_ids_string: '2,11', max_message_id: 150},

6
static/js/pm_conversations.js
View File

@@ -70,12 +70,10 @@ exports.recent = (function () {
return _.pluck(recent_private_messages, 'user_ids_string'); return _.pluck(recent_private_messages, 'user_ids_string');
}; };
self.initialize = function () { self.initialize = function (params) {
for (const conversation of page_params.recent_private_conversations) { for (const conversation of params.recent_private_conversations) {
self.insert(conversation.user_ids, conversation.max_message_id); self.insert(conversation.user_ids, conversation.max_message_id);
} }
delete page_params.recent_private_messages;
}; };
return self; return self;

6
static/js/ui_init.js
View File

@@ -394,6 +394,10 @@ exports.initialize_everything = function () {
'cross_realm_bots' 'cross_realm_bots'
); );
const pm_conversations_params = pop_fields(
'recent_private_conversations'
);
const presence_params = pop_fields( const presence_params = pop_fields(
'presences', 'presences',
'initial_servertime' 'initial_servertime'
@@ -422,7 +426,7 @@ exports.initialize_everything = function () {
stream_color.initialize(); stream_color.initialize();
stream_edit.initialize(); stream_edit.initialize();
stream_data.initialize(stream_data_params); stream_data.initialize(stream_data_params);
pm_conversations.recent.initialize(); pm_conversations.recent.initialize(pm_conversations_params);
muting.initialize(); muting.initialize();
subs.initialize(); subs.initialize();
stream_list.initialize(); stream_list.initialize();