Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 17:22:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

delete auto-saved drafts if the user chooses not to save the message, sr=mscott 307046

Browse Source
This commit is contained in:
bienvenu%nventure.com 2007-01-16 00:42:01 +00:00
parent 0f89c31418
commit def90e0e5f
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mail/components/compose/content/MsgComposeCommands.js
View File

@ -21,6 +21,7 @@
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# David Bienvenu <bienvenu@nventure.com>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
@ -122,6 +123,8 @@ var gAttachVCardOptionChanged;
var gMailSession;
var gAutoSaveInterval;
var gAutoSaveTimeout;
var gExplicitSave;
var gEditingDraft;
const kComposeAttachDirPrefName = "mail.compose.attach.dir";
@ -1438,6 +1441,8 @@ function ComposeStartup(recycled, aParams)
}
}
gEditingDraft = gMsgCompose.compFields.draftId;
// finally, see if we need to auto open the address sidebar.
var sideBarBox = document.getElementById('sidebar-box');
if (sideBarBox.getAttribute("sidebarVisible") == "true")
@ -1452,6 +1457,8 @@ function ComposeStartup(recycled, aParams)
if (gAutoSaveInterval)
gAutoSaveTimeout = setTimeout(AutoSave, gAutoSaveInterval);
gExplicitSave = false;
}
// The new, nice, simple way of getting notified when a new editor has been created
@ -2021,6 +2028,8 @@ function SaveAsDraft()
{
dump("SaveAsDraft from XUL\n");
gExplicitSave = true;
GenericSendMessage(nsIMsgCompDeliverMode.SaveAsDraft);
defaultSaveOperation = "draft";
}
@ -2490,7 +2499,7 @@ function ComposeCanClose()
}
// Returns FALSE only if user cancels save action
if (gContentChanged || gMsgCompose.bodyModified)
if (gContentChanged || gMsgCompose.bodyModified || !gExplicitSave)
{
// call window.focus, since we need to pop up a dialog
// and therefore need to be visible (to prevent user confusion)
@ -2514,6 +2523,10 @@ function ComposeCanClose()
case 1: //Cancel
return false;
case 2: //Don't Save
// don't delete the draft if we didn't start off editing a draft
// and the user hasn't explicitly saved it.
if (!gEditingDraft && !gExplicitSave)
RemoveDraft();
break;
}
}
@ -2524,6 +2537,34 @@ function ComposeCanClose()
return true;
}
const MSG_FOLDER_FLAG_DRAFTS = 0x0400;
function RemoveDraft()
{
try
{
var draftUri = gMsgCompose.compFields.draftId;
var msgKey = draftUri.substr(draftUri.indexOf('#') + 1);
var folder = sRDF.GetResource(gMsgCompose.savedFolderURI).QueryInterface(Components.interfaces.nsIMsgFolder);
try {
if (folder.flags & MSG_FOLDER_FLAG_DRAFTS)
{
var msgs = Components.classes["@mozilla.org/supports-array;1"].
createInstance(Components.interfaces.nsISupportsArray);
msgs.AppendElement(folder.GetMessageHeader(msgKey));
folder.deleteMessages(msgs, null, true, false, null, false);
}
}
catch (ex) // couldn't find header - perhaps an imap folder.
{
var imapFolder = folder.QueryInterface(Components.interfaces.nsIMsgImapMailFolder);
var keyArray = new Array;
keyArray[0] = msgKey;
imapFolder.storeImapFlags(8, true, keyArray, 1, null);
}
} catch (ex) {}
}
function SetContentAndBodyAsUnmodified()
{
gMsgCompose.bodyModified = false;

2
mailnews/compose/public/nsIMsgCompose.idl
View File

@ -233,7 +233,7 @@ interface nsIMsgCompose : nsISupports {
[noscript] void setCiteReference(in nsString citeReference);
/* Set the URI of the folder where the message has been saved */
[noscript] attribute string savedFolderURI;
attribute string savedFolderURI;
/* Append the signature defined in the identity to the msgBody */
[noscript] void processSignature(in nsIMsgIdentity identity,