From 9ba5751b820f5a0429eb4071bebec989024c8e25 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 7 Feb 2008 20:24:41 +0000 Subject: [PATCH] Monotone-Parent: b97dac121b3e91b85aa6501ada5f0c990f1a4023 Monotone-Revision: ae6fe76c802adffd3a6829c353459ef85ab58cc3 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-02-07T20:24:41 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/MailerUI.js | 8 +++++++- UI/WebServerResources/generic.js | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index c4b8b4530..649ad6b25 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -494,7 +494,11 @@ function openMailbox(mailbox, reload, idx) { var account = Mailer.currentMailbox.split("/")[1]; if (accounts[account].supportsQuotas) { var quotasUrl = ApplicationBaseURL + mailbox + "/quotas"; - triggerAjaxRequest(quotasUrl, quotasCallback); + if (document.quotaAjaxRequest) { + document.quotaAjaxRequest.aborted = true; + document.quotaAjaxRequest.abort(); + } + document.quotaAjaxRequest = triggerAjaxRequest(quotasUrl, quotasCallback); } } } @@ -601,6 +605,8 @@ function quotasCallback(http) { window.status = text; } } + + document.quotaAjaxRequest = null; } function onMessageContextMenu(event) { diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index c5ef30a00..0888d79a5 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -322,7 +322,7 @@ function onAjaxRequestStateChange(http) { http.callbackData = null; } } - catch (e) { + catch(e) { activeAjaxRequests--; checkAjaxRequestsState(); http.onreadystatechange = Prototype.emptyFunction;