diff options
author | Lisa Junger <ljunger@thoughtworks.com> | 2014-12-08 16:23:25 +0100 |
---|---|---|
committer | Lisa Junger <ljunger@thoughtworks.com> | 2014-12-09 15:47:55 +0100 |
commit | be5540272d6e39c49fbcad87945211462dcc780d (patch) | |
tree | e22bc1daa5dceeb5f16b32fe7c5d788a49242f3d /web-ui/app/js/mail_view/data | |
parent | 695b5a035be7c5ceeba289f1613b5e0e5b6d2aba (diff) |
issue #172 adopted behavior of send button to monitored ajax calls.
Diffstat (limited to 'web-ui/app/js/mail_view/data')
-rw-r--r-- | web-ui/app/js/mail_view/data/mail_sender.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web-ui/app/js/mail_view/data/mail_sender.js b/web-ui/app/js/mail_view/data/mail_sender.js index f769c262..a5a28209 100644 --- a/web-ui/app/js/mail_view/data/mail_sender.js +++ b/web-ui/app/js/mail_view/data/mail_sender.js @@ -48,11 +48,12 @@ define( contextMessage = context + ': '; } - if (xhr.responseJSON.message) { + if (xhr && xhr.responseJSON && xhr.responseJSON.message) { on.trigger(document, events.ui.userAlerts.displayMessage, {message: contextMessage + xhr.responseJSON.message}); } else { on.trigger(document, events.ui.userAlerts.displayMessage, {message: 'Ops! something went wrong, try again later.'}); } + on.trigger(document, events.mail.send_failed, {xhr: xhr, error:error}); }; } |