Monotone-Parent: 9d07dc2dfdd810c4a1b91b9837f778527a330d96

Monotone-Revision: 88b79b72766239b6ea1ac581133967539b7f9f27

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-16T18:55:28
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-11-16 18:55:28 +00:00
parent 4f09cb6674
commit 48d7b85299
2 changed files with 20 additions and 7 deletions

View File

@ -1,3 +1,12 @@
2010-11-16 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js: (onCASRecoverIFrameLoaded):
the ajax recovery request is now performed from a timeout attached
to the window, to make sure it does not reference the iframe
itself. The iframe is removed from a similar timeout, to avoid
reference errors and a continuous spinning wheel after a recovery
request.
2010-11-15 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (refreshMailbox): now calls

View File

@ -262,19 +262,23 @@ function onCASRecoverIFrameLoaded(event) {
if (this.request) {
var request = this.request;
if (request.attempt == 0) {
triggerAjaxRequest(request.url,
request.callback,
request.callbackData,
request.content,
request.paramHeaders,
1);
window.setTimeout(function() {
triggerAjaxRequest(request.url,
request.callback,
request.callbackData,
request.content,
request.paramHeaders,
1); },
100);
}
else {
window.location.href = UserFolderURL;
}
this.request = null;
}
this.parentNode.removeChild(this);
var this_ = this;
window.setTimeout(function() { this_.parentNode.removeChild(this_); },
500);
}
function onAjaxRequestStateChange(http) {