diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/js/app.js | 14 |
2 files changed, 6 insertions, 9 deletions
@@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Fix AJAX requests errors handler (#1485000) - Speed up message list displaying on IE - Fix read/write database recognition (#1485811) - Fix quicksearchbox look in Chrome and Konqueror (#1484841) 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 |