Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make bankrupting more resilient against regular pointer updates being in flight. 

(imported from commit 90e1dc16e7d3295b6ed3f5993fe82ac4fcd2d7cc)
This commit is contained in:
Jessica McKellar 2013-06-19 14:05:44 -04:00
parent 24b41351a6
commit 05bbfb42a9
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
zephyr/static/js/zephyr.js
View File

@ -412,11 +412,10 @@ function mark_read_between(msg_list, start_id, end_id) {
process_read_messages(mark_as_read); process_read_messages(mark_as_read);
} }
function send_pointer_update() { function update_pointer() {
if (!pointer_update_in_flight && if (!pointer_update_in_flight) {
furthest_read > server_furthest_read) {
pointer_update_in_flight = true; pointer_update_in_flight = true;
$.ajax({ return $.ajax({
type: 'POST', type: 'POST',
url: '/json/update_pointer', url: '/json/update_pointer',
data: {pointer: furthest_read}, data: {pointer: furthest_read},
@ -429,6 +428,25 @@ function send_pointer_update() {
pointer_update_in_flight = false; pointer_update_in_flight = false;
} }
}); });
} else {
// Return an empty, resolved Deferred.
return $.when();
}
}
function send_pointer_update() {
// Only bother if you've read new messages.
if (furthest_read > server_furthest_read) {
update_pointer();
}
}
function unconditionally_send_pointer_update() {
if (pointer_update_in_flight) {
// Keep trying.
return unconditionally_send_pointer_update();
} else {
return update_pointer();
} }
} }
@ -1214,9 +1232,10 @@ function fast_forward_pointer() {
success: function (data) { success: function (data) {
mark_all_as_read(function () { mark_all_as_read(function () {
furthest_read = data.max_message_id; furthest_read = data.max_message_id;
send_pointer_update(); unconditionally_send_pointer_update().then(function () {
ui.change_tab_to('#home'); ui.change_tab_to('#home');
reload.initiate({immediate: true}); reload.initiate({immediate: true});
});
}); });
} }
}); });