From 9ff9f516d353a853c7a79fc9c7bd0d842c413011 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 21 Apr 2009 08:46:11 -0400
Subject: [PATCH] - Fix AJAX requests errors handler (#1485000)
---
CHANGELOG | 1 +
program/js/app.js | 14 +++++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 798c332..458886b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 24e871a..627ddf5 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3911,16 +3911,12 @@
// 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
--
Gitblit v1.9.1