amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

JavaScript: fix bug with mail popup windows and event invitations.

Browse Source 
Monotone-Parent: 70c32f73a22fee53cf4091db0d979ff59560ca99
Monotone-Revision: 31bc4f6b49316e2603b7496cfee3b18fdd5e490f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-13T19:14:21
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-13 19:14:21 +00:00
parent db94ff7d3f
commit 2da9e90ebc
2 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4
View File
@@ -1,5 +1,9 @@
2009-10-13 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/MailerUI.js (-ICalendarButtonCallback):
delegate the execution of this method to the parent when called
from a popup window. This way, popups are properly reloaded when necessary.
* SoObjects/Appointments/SOGoAppointmentObject.m (-
_handleAttendee:withDelegate:ownerUser:statusChange:inEvent:):
added proper initialization of variable.
UI/WebServerResources/MailerUI.js
+35 -20
View File
@@ -1099,6 +1099,7 @@ function configureiCalLinksInMessage() {
delegatedToLink.stopObserving("click");
delegatedToLink.observe("click", function(event) {
$("delegatedTo").show();
$("iCalendarDelegate").show();
$("delegatedTo").focus();
this.hide();
Event.stop(event);
@@ -1110,8 +1111,12 @@ function configureiCalLinksInMessage() {
function onICalendarDelegate(event) {
var link = $("iCalendarAttachment").value;
if (link) {
var currentMsg = Mailer.currentMailbox + "/"
+ Mailer.currentMessages[Mailer.currentMailbox];
var currentMsg;
if ($(document.body).hasClassName("popup"))
currentMsg = mailboxName + "/" + messageName;
else
currentMsg = Mailer.currentMailbox + "/"
+ Mailer.currentMessages[Mailer.currentMailbox];
delegateInvitation(link, ICalendarButtonCallback, currentMsg);
}
}
@@ -1130,26 +1135,36 @@ function onICalendarButtonClick(event) {
}
function ICalendarButtonCallback(http) {
if (isHttpStatus204(http.status)) {
var oldMsg = http.callbackData;
var msg = Mailer.currentMailbox + "/" + Mailer.currentMessages[Mailer.currentMailbox];
deleteCachedMessage(oldMsg);
if (oldMsg == msg) {
loadMessage(Mailer.currentMessages[Mailer.currentMailbox]);
}
for (var i = 0; i < Mailer.popups.length; i++)
if (Mailer.popups[i].messageUID == oldMsg) {
Mailer.popups[i].location.reload();
break;
if ($(document.body).hasClassName("popup")) {
if (window.opener && window.opener.open && !window.opener.closed)
window.opener.ICalendarButtonCallback(http);
else
window.location.reload();
}
else {
log ("ICalendarButtonCallback");
if (isHttpStatus204(http.status)) {
var oldMsg = http.callbackData;
var msg = Mailer.currentMailbox + "/" + Mailer.currentMessages[Mailer.currentMailbox]; log (oldMsg + " => " + msg);
deleteCachedMessage(oldMsg);
if (oldMsg == msg) {
loadMessage(Mailer.currentMessages[Mailer.currentMailbox]);
}
for (var i = 0; i < Mailer.popups.length; i++) {
if (Mailer.popups[i].messageUID == oldMsg) {
Mailer.popups[i].location.reload();
break;
}
}
}
else if (http.status == 403) {
var data = http.responseText;
var msg = data.replace(/^(.*\n)*.*<p>((.*\n)*.*)<\/p>(.*\n)*.*$/, "$2");
window.alert(clabels[msg]?clabels[msg]:msg);
}
else
window.alert("received code: " + http.status + "\nerror: " + http.responseText);
}
else if (http.status == 403) {
var data = http.responseText;
var msg = data.replace(/^(.*\n)*.*<p>((.*\n)*.*)<\/p>(.*\n)*.*$/, "$2");
window.alert(clabels[msg]?clabels[msg]:msg);
}
else
window.alert("received code: " + http.status + "\nerror: " + http.responseText);
}
function resizeMailContent() {