summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-04-21 12:46:11 +0000
committeralecpl <alec@alec.pl>2009-04-21 12:46:11 +0000
commit9ff9f516d353a853c7a79fc9c7bd0d842c413011 (patch)
tree85cb424ee91d3ef714ae03801d58ae1c43d1cf62 /program
parent7c8b80600d2ab38ceb9ebad444f8a8db40278ef5 (diff)
- Fix AJAX requests errors handler (#1485000)
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js14
1 files changed, 5 insertions, 9 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 24e871ab5..627ddf5b6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3911,16 +3911,12 @@ function rcube_webmail()
// handle HTTP request errors
this.http_error = function(request, status, err)
{
- alert(status+":"+err);
-/*
- //alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
- if (request_obj.__lock)
- this.set_busy(false);
+ var errmsg = request.statusText;
- request_obj.reset();
- request_obj.__lock = false;
- this.display_message('Unknown Server Error!', 'error');
-*/
+ this.set_busy(false);
+ request.abort();
+
+ this.display_message('Unknown Server Error!' + (errmsg ? ' ('+errmsg+')' : ''), 'error');
};
// use an image to send a keep-alive siganl to the server