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

Fix for bug #3065

Browse Source 
Monotone-Parent: 64c0713802f9595de3f792409a68ecb74bb80532
Monotone-Revision: 389ebfd16dbf972c7427f7a8ebab62d72400c15c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-24T22:30:19
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2008-10-24 22:30:19 +00:00
parent 40d5c508cc
commit dafb17c05a
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Templates/MailerUI/UIxMailPopupView.wox
+4
View File
@@ -7,6 +7,10 @@
className="UIxPageFrame"
title="title"
const:popup="YES">
<script type="text/javascript">
var messageName = '<var:string value="clientObject.relativeImap4Name"/>';
var mailboxName = '/<var:string value="clientObject.container.container.nameInContainer"/>/<var:string value="clientObject.container.nameInContainer"/>';
</script>
<span id="messageContent">
<var:component className="UIxMailView" />
</span>
UI/WebServerResources/MailerUI.js
+3 -1
View File
@@ -386,8 +386,10 @@ function onMenuDeleteMessage(event) {
function deleteMessage(url, id, mailbox, messageId) {
var data = { "id": new Array(id), "mailbox": mailbox, "path": new Array(messageId) };
var parameters = "uid=" + id;
deleteMessageRequestCount++;
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data);
triggerAjaxRequest(url, deleteSelectedMessagesCallback, data, parameters,
{ "Content-type": "application/x-www-form-urlencoded" });
}
function deleteMessageWithDelay(url, id, mailbox, messageId) {
UI/WebServerResources/UIxMailPopupView.js
+3 -8
View File
@@ -44,15 +44,10 @@ function onICalendarButtonClick(event) {
function onMenuDeleteMessage(event) {
if (window.opener && window.opener.open && !window.opener.closed) {
var rowId_index = window.name.search(/[0-9]+$/);
var rowId = window.name.substr(rowId_index);
var messageId = window.opener.Mailer.currentMailbox + "/" + rowId;
var url = ApplicationBaseURL + messageId + "/trash";
var url = ApplicationBaseURL + encodeURI(mailboxName) + "/deleteMessages";
var path = mailboxName + "/" + messageName;
window.opener.deleteMessageWithDelay(url,
rowId,
window.opener.Mailer.currentMailbox,
messageId);
window.opener.deleteMessageWithDelay(url, messageName, mailboxName, path);
}
window.close();