Monotone-Parent: 68e43f2315bf24800d73ddb9f73af051eca9aba4

Monotone-Revision: 73611f6bef70fd39e1aa66a4aae311b19f594980

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-12-10T15:56:13
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-12-10 15:56:13 +00:00
parent 490ce13fe4
commit d1a05ac86c
2 changed files with 54 additions and 23 deletions

View File

@@ -213,24 +213,24 @@ function ml_lowlight(sender) {
/* bulk delete of messages */
function deleteSelectedMessages(sender) {
var messageList = $("messageList");
var rowIds = messageList.getSelectedRowsId();
if (rowIds.length > 0) {
for (var i = 0; i < rowIds.length; i++) {
var url;
var rowId = rowIds[i].substr(4);
var messageId = Mailer.currentMailbox + "/" + rowId;
url = ApplicationBaseURL + messageId + "/trash";
deleteMessageRequestCount++;
var data = { "id": rowId, "mailbox": Mailer.currentMailbox, "messageId": messageId };
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
}
} else {
window.alert(labels["Please select a message."]);
}
return false;
var messageList = $("messageList");
var rowIds = messageList.getSelectedRowsId();
if (rowIds.length > 0) {
for (var i = 0; i < rowIds.length; i++) {
var url;
var rowId = rowIds[i].substr(4);
var messageId = Mailer.currentMailbox + "/" + rowId;
url = ApplicationBaseURL + messageId + "/trash";
deleteMessageRequestCount++;
var data = { "id": rowId, "mailbox": Mailer.currentMailbox, "messageId": messageId };
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
}
}
else
window.alert(labels["Please select a message."]);
return false;
}
function deleteSelectedMessagesCallback(http) {
@@ -240,7 +240,6 @@ function deleteSelectedMessagesCallback(http) {
deleteCachedMessage(data["messageId"]);
deleteMessageRequestCount--;
if (Mailer.currentMailbox == data["mailbox"]) {
var div = $('messageContent');
if (Mailer.currentMessages[Mailer.currentMailbox] == data["id"]) {
div.update();
@@ -273,8 +272,7 @@ function deleteDraft(url) {
new Ajax.Request(url, {
method: 'post',
onFailure: function(transport) {
if (!isHttpStatus204)
log("draftDeleteCallback: problem during ajax request: " + transport.status);
log("draftDeleteCallback: problem during ajax request: " + transport.status);
}
});
}
@@ -318,8 +316,24 @@ function moveMessages(rowIds, folder) {
}
function onMenuDeleteMessage(event) {
deleteSelectedMessages();
preventDefault(event);
deleteSelectedMessages();
preventDefault(event);
}
function deleteMessage(url, id, mailbox, messageId) {
var data = { "id": id, "mailbox": mailbox, "messageId": messageId };
deleteMessageRequestCount++;
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
}
function deleteMessageWithDelay(url, id, mailbox, messageId) {
/* this is called by UIxMailPopupView with window.opener */
setTimeout("deleteMessage('" +
url + "', '" +
id + "', '" +
mailbox + "', '" +
messageId + "')",
50);
}
function onPrintCurrentMessage(event) {

View File

@@ -9,4 +9,21 @@ function initPopupMailer(event) {
resizeMailContent();
}
function onMenuDeleteMessage(event) {
if (window.opener && window.opener.open && !window.opener.closed) {
var rowId = window.name.substr(9);
var messageId = window.opener.Mailer.currentMailbox + "/" + rowId;
var url = ApplicationBaseURL + messageId + "/trash";
window.opener.deleteMessageWithDelay(url,
rowId,
window.opener.Mailer.currentMailbox,
messageId);
}
window.close();
return false;
}
FastInit.addOnLoad(initPopupMailer);