Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove conflict that was checked into cvs

Browse Source
This commit is contained in:
scott%scott-macgregor.org 2003-12-04 07:11:52 +00:00
parent 567e341b75
commit cbc3a61c6e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1778,15 +1778,9 @@ function Save()
function SaveAsFile(saveAs)
{
<<<<<<< MsgComposeCommands.js
dump("SaveAsFile from XUL\n");
var subject = document.getElementById('msgSubject').value;
GetCurrentEditor().setDocumentTitle(subject);
=======
dump("SaveAsFile from XUL\n");
var subject = document.getElementById('msgSubject').value;
GetCurrentEditor().setDocumentTitle(subject);
>>>>>>> 1.26
if (gMsgCompose.bodyConvertible() == nsIMsgCompConvertible.Plain)
SaveDocument(saveAs, false, "text/plain");
@ -2290,9 +2284,9 @@ function AttachPage()
{
var attachment = Components.classes["@mozilla.org/messengercompose/attachment;1"].createInstance(Components.interfaces.nsIMsgAttachment);
attachment.url = result.value;
AddAttachment(attachment);
var attachmentBox = document.getElementById("attachments-box");
attachmentBox.hidden = false;
AddAttachment(attachment);
var attachmentBox = document.getElementById("attachments-box");
attachmentBox.hidden = false;
document.getElementById("attachmentbucket-sizer").hidden=false;
}
}