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

presence: Extract presence.initialize().

Browse Source
This commit is contained in:
Steve Howell
2020-02-07 15:33:03 +00:00
committed by Tim Abbott
parent b63909ad41
commit 75dbc4a2b1
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend_tests/node_tests/activity.js
View File

@@ -844,7 +844,6 @@ run_test('initialize', () => {
activity.client_is_active = false; activity.client_is_active = false;
activity.initialize(); activity.initialize();
assert.equal(page_params.presences, undefined);
clear(); clear();
assert(scroll_handler_started); assert(scroll_handler_started);

7
frontend_tests/node_tests/presence.js
View File

@@ -5,6 +5,7 @@ const return_false = function () { return false; };
set_global('server_events', {}); set_global('server_events', {});
set_global('blueslip', {}); set_global('blueslip', {});
set_global('page_params', {});
set_global('reload_state', { set_global('reload_state', {
is_in_progress: return_false, is_in_progress: return_false,
}); });
@@ -160,7 +161,11 @@ run_test('set_presence_info', () => {
}, },
}; };
presence.set_info(presences, base_time); page_params.presences = presences;
page_params.initial_servertime = base_time;
presence.initialize();
assert.equal(page_params.presences, undefined);
assert.deepEqual(presence.presence_info.get(alice.user_id), assert.deepEqual(presence.presence_info.get(alice.user_id),
{ status: 'active', last_active: 500} { status: 'active', last_active: 500}

2
frontend_tests/node_tests/ui_init.js
View File

@@ -88,6 +88,7 @@ zrequire('invite');
zrequire('tab_bar'); zrequire('tab_bar');
zrequire('narrow_state'); zrequire('narrow_state');
zrequire('people'); zrequire('people');
zrequire('presence');
zrequire('search_pill_widget'); zrequire('search_pill_widget');
zrequire('user_groups'); zrequire('user_groups');
zrequire('unread'); zrequire('unread');
@@ -158,6 +159,7 @@ page_params.realm_user_groups = [];
page_params.realm_bots = []; page_params.realm_bots = [];
page_params.realm_filters = []; page_params.realm_filters = [];
page_params.starred_messages = []; page_params.starred_messages = [];
page_params.presences = [];
$('#tab_bar').append = () => {}; $('#tab_bar').append = () => {};
$('#compose').filedrop = () => {}; $('#compose').filedrop = () => {};

4
static/js/activity.js
View File

@@ -354,10 +354,6 @@ exports.initialize = function () {
onActive: mark_client_active, onActive: mark_client_active,
keepTracking: true}); keepTracking: true});
presence.set_info(page_params.presences,
page_params.initial_servertime);
delete page_params.presences;
exports.set_cursor_and_filter(); exports.set_cursor_and_filter();
exports.build_user_sidebar(); exports.build_user_sidebar();

6
static/js/presence.js
View File

@@ -151,4 +151,10 @@ exports.last_active_date = function (user_id) {
return date; return date;
}; };
exports.initialize = function () {
presence.set_info(page_params.presences,
page_params.initial_servertime);
delete page_params.presences;
};
window.presence = exports; window.presence = exports;

1
static/js/ui_init.js
View File

@@ -339,6 +339,7 @@ exports.initialize_everything = function () {
hashchange.initialize(); hashchange.initialize();
pointer.initialize(); pointer.initialize();
unread_ui.initialize(); unread_ui.initialize();
presence.initialize();
activity.initialize(); activity.initialize();
emoji_picker.initialize(); emoji_picker.initialize();
compose_fade.initialize(); compose_fade.initialize();