From dadaa9fda3191c00daa41a2bc44ed491cd18eb7f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 1 Nov 2010 19:28:38 +0000 Subject: [PATCH] Monotone-Parent: 5230458dba570c663e9087a99852e38cfb26de0f Monotone-Revision: 1b073e285785f32b4c27e867a0e0d363fdc74264 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-11-01T19:28:38 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/generic.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9cb1cbd9e..db7664943 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-11-01 Wolfgang Sourdeau + * UI/WebServerResources/generic.js (triggerAjaxRequest): invoke + the request callback only when set on the http object. + * SoObjects/Mailer/SOGoMailBaseObject.m (-_createIMAP4Connection): we need to initialize newConnection to nil when the return password is nil. diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index f8c7eca44..6561709a8 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -287,7 +287,7 @@ function onAjaxRequestStateChange(http) { createCASRecoveryIFrame(http); } else if (activeAjaxRequests > 0) { - if (!http.aborted) + if (!http.aborted && http.callback) http.callback(http); activeAjaxRequests--; checkAjaxRequestsState();