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

Make reload save options required explicit arguments.

Browse Source
This commit is contained in:
Tim Abbott
2015-11-30 08:47:19 -08:00
parent 12bff0441c
commit 05acd510c0
4 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/channel.js
View File

@@ -35,7 +35,10 @@ function call(args, idempotent) {
if (xhr.status === 403) { if (xhr.status === 403) {
try { try {
if ($.parseJSON(xhr.responseText).msg.indexOf("CSRF Error:") !== -1) { if ($.parseJSON(xhr.responseText).msg.indexOf("CSRF Error:") !== -1) {
reload.initiate({immediate: true}); reload.initiate({immediate: true,
save_pointer: true,
save_narrow: true,
save_compose: true});
} }
} catch (ex) { } catch (ex) {
blueslip.error('Unexpected 403 response from server', blueslip.error('Unexpected 403 response from server',

6
static/js/compose.js
View File

@@ -366,7 +366,11 @@ function send_message_ajax(request, success, error) {
error: function (xhr, error_type) { error: function (xhr, error_type) {
if (error_type !== 'timeout' && reload.is_pending()) { if (error_type !== 'timeout' && reload.is_pending()) {
// The error might be due to the server changing // The error might be due to the server changing
reload.initiate({immediate: true, send_after_reload: true}); reload.initiate({immediate: true,
save_pointer: true,
save_narrow: true,
save_compose: true,
send_after_reload: true});
return; return;
} }

6
static/js/reload.js
View File

@@ -199,6 +199,12 @@ exports.initiate = function (options) {
send_after_reload: false send_after_reload: false
}); });
if (options.save_pointer === undefined ||
options.save_narrow === undefined ||
options.save_compose === undefined) {
blueslip.error("reload.initiate() called without explicit save options.");
}
if (options.immediate) { if (options.immediate) {
do_reload_app(options.send_after_reload, do_reload_app(options.send_after_reload,
options.save_pointer, options.save_pointer,

6
static/js/server_events.js
View File

@@ -67,7 +67,11 @@ function get_events_success(events) {
new_pointer = event.pointer; new_pointer = event.pointer;
break; break;
case 'restart': case 'restart':
reload.initiate({message: "The application has been updated; reloading!"}); reload.initiate({save_pointer: true,
save_narrow: true,
save_compose: true,
message: "The application has been updated; reloading!"
});
break; break;
case 'update_message': case 'update_message':
messages_to_update.push(event); messages_to_update.push(event);