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

Don't try to show the user blueslip messages if ui.js hasn't been loaded yet 

The user will probably get another error message later, anyway.

(imported from commit 4f52925600826366a8349fefc85d43b6e1923087)
This commit is contained in:
Zev Benjamin 2013-05-16 16:47:08 -04:00 committed by Leo Franchi
parent 1fae5cfed4
commit f0f6af2b45
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/static/js/blueslip.js
View File

@ -46,7 +46,7 @@ function report_error(msg, stack, opts) {
timeout: 3*1000, timeout: 3*1000,
success: function () { success: function () {
reported_errors[key] = true; reported_errors[key] = true;
if (opts.show_ui_msg) { if (opts.show_ui_msg && ui !== undefined) {
// There are a few races here (and below in the error // There are a few races here (and below in the error
// callback): // callback):
// 1) The ui module or something it requires might // 1) The ui module or something it requires might
@ -54,8 +54,10 @@ function report_error(msg, stack, opts) {
// 2) The DOM might not be ready yet and so fetching // 2) The DOM might not be ready yet and so fetching
// the #home-error div might fail. // the #home-error div might fail.
// There's not much we can do about (1) and we can't // For (1) we just don't show the message if the ui
// solve (2) by using $(document).ready() because the // hasn't been loaded yet. The user will probably
// get another error once it does. We can't solve
// (2) by using $(document).ready() because the
// callback never gets called (I think what's going // callback never gets called (I think what's going
// on here is if the exception was raised by a // on here is if the exception was raised by a
// function that was called as a result of the DOM // function that was called as a result of the DOM
@ -72,7 +74,7 @@ function report_error(msg, stack, opts) {
} }
}, },
error: function () { error: function () {
if (opts.show_ui_msg) { if (opts.show_ui_msg && ui !== undefined) {
ui.report_message("Oops. It seems something has gone wrong. " + ui.report_message("Oops. It seems something has gone wrong. " +
"Please try reloading the page.", "Please try reloading the page.",
$("#home-error"), "alert-error"); $("#home-error"), "alert-error");