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

Inform clients to reload via a 'restart' event sent on Tornado start up

Browse Source 
(imported from commit 10bb45547ea0bf34e56fc620ecd7415bb8a825c5)
This commit is contained in:
Zev Benjamin
2013-03-20 18:53:46 -04:00
parent e4fba59538
commit 4bc9152f71
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zephyr/static/js/zephyr.js
View File

@@ -12,7 +12,6 @@ var viewport = $(window);
var get_updates_params = {
pointer: -1,
server_generation: -1, /* to be filled in on document.ready */
last_event_id: 0
};
var get_updates_failures = 0;
@@ -606,14 +605,6 @@ function get_updates(options) {
get_updates_params.pointer = furthest_read;
get_updates_params.dont_block = options.dont_block || get_updates_failures > 0;
get_updates_params.queue_id = page_params.event_queue_id;
if (reload.is_pending()) {
// We only send a server_generation to the server if we're
// interested in an immediate reply to tell us if we need to
// reload. Once we're already reloading, we need to not
// submit the parameter, so that the server will process our
// future requests in longpolling mode.
delete get_updates_params.server_generation;
}
get_updates_xhr = $.ajax({
type: 'POST',
@@ -633,12 +624,6 @@ function get_updates(options) {
get_updates_failures = 0;
$('#connection-error').hide();
if (get_updates_params.server_generation === -1) {
get_updates_params.server_generation = data.server_generation;
} else if (data.server_generation !== get_updates_params.server_generation) {
reload.initiate();
}
var messages = [];
var new_pointer;
@@ -655,7 +640,10 @@ function get_updates(options) {
messages.push(event.message);
break;
case 'pointer':
new_pointer = event.new_pointer;
new_pointer = event.pointer;
break;
case 'restart':
reload.initiate();
break;
}
});