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

Don't always claim that the application has been updated when reloading

Browse Source 
I don't love the default reloading message, but I'm not sure how to
tell the user why we need to reload in several cases.

(imported from commit 5f2eecdb0d83f31bd60673b247e8aac8f08ce20f)
This commit is contained in:
Zev Benjamin
2013-06-18 15:03:20 -04:00
parent eb62a31bb8
commit 08097d6788
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
zephyr/static/js/reload.js
View File

@@ -69,13 +69,16 @@ $(function () {
} }
}); });
function do_reload_app(send_after_reload) { function do_reload_app(send_after_reload, message) {
// TODO: we should completely disable the UI here // TODO: we should completely disable the UI here
if (compose.composing()) { if (compose.composing()) {
preserve_compose(send_after_reload); preserve_compose(send_after_reload);
} }
if (message === undefined) {
message = "Reloading";
}
// TODO: We need a better API for showing messages. // TODO: We need a better API for showing messages.
ui.report_message("The application has been updated; reloading!", $("#reloading-application")); ui.report_message(message, $("#reloading-application"));
reload_in_progress = true; reload_in_progress = true;
window.location.reload(true); window.location.reload(true);
} }
@@ -86,7 +89,7 @@ exports.initiate = function (options) {
options = $.extend(defaults, options); options = $.extend(defaults, options);
if (options.immediate) { if (options.immediate) {
do_reload_app(options.send_after_reload); do_reload_app(options.send_after_reload, options.message);
} }
if (reload_pending) { if (reload_pending) {
@@ -104,12 +107,16 @@ exports.initiate = function (options) {
var compose_done_handler, compose_started_handler; var compose_done_handler, compose_started_handler;
// Make sure we always do a reload eventually // Make sure we always do a reload eventually
setTimeout(function () { do_reload_app(false); }, unconditional_timeout); setTimeout(function () { do_reload_app(false, options.message); }, unconditional_timeout);
function reload_from_idle () {
do_reload_app(false, options.message);
}
compose_done_handler = function () { compose_done_handler = function () {
idle_control.cancel(); idle_control.cancel();
idle_control = $(document).idle({'idle': home_timeout, idle_control = $(document).idle({'idle': home_timeout,
'onIdle': do_reload_app}); 'onIdle': reload_from_idle});
$(document).off('compose_canceled.zephyr compose_finished.zephyr', $(document).off('compose_canceled.zephyr compose_finished.zephyr',
compose_done_handler); compose_done_handler);
$(document).on('compose_started.zephyr', compose_started_handler); $(document).on('compose_started.zephyr', compose_started_handler);
@@ -117,7 +124,7 @@ exports.initiate = function (options) {
compose_started_handler = function () { compose_started_handler = function () {
idle_control.cancel(); idle_control.cancel();
idle_control = $(document).idle({'idle': composing_timeout, idle_control = $(document).idle({'idle': composing_timeout,
'onIdle': do_reload_app}); 'onIdle': reload_from_idle});
$(document).off('compose_started.zephyr', compose_started_handler); $(document).off('compose_started.zephyr', compose_started_handler);
$(document).on('compose_canceled.zephyr compose_finished.zephyr', $(document).on('compose_canceled.zephyr compose_finished.zephyr',
compose_done_handler); compose_done_handler);
@@ -125,12 +132,12 @@ exports.initiate = function (options) {
if (compose.composing()) { if (compose.composing()) {
idle_control = $(document).idle({'idle': composing_timeout, idle_control = $(document).idle({'idle': composing_timeout,
'onIdle': do_reload_app}); 'onIdle': reload_from_idle});
$(document).on('compose_canceled.zephyr compose_finished.zephyr', $(document).on('compose_canceled.zephyr compose_finished.zephyr',
compose_done_handler); compose_done_handler);
} else { } else {
idle_control = $(document).idle({'idle': home_timeout, idle_control = $(document).idle({'idle': home_timeout,
'onIdle': do_reload_app}); 'onIdle': reload_from_idle});
$(document).on('compose_started.zephyr', compose_started_handler); $(document).on('compose_started.zephyr', compose_started_handler);
} }
}; };

2
zephyr/static/js/zephyr.js
View File

@@ -838,7 +838,7 @@ function get_updates(options) {
new_pointer = event.pointer; new_pointer = event.pointer;
break; break;
case 'restart': case 'restart':
reload.initiate(); reload.initiate({message: "The application has been updated; reloading!"});
break; break;
case 'onboarding_steps': case 'onboarding_steps':
onboarding.set_step_info(event.steps); onboarding.set_step_info(event.steps);