From 798afa71ebeaf9b6f785bb65ddae55b047cbec0b Mon Sep 17 00:00:00 2001 From: "ducarroz%netscape.com" Date: Sat, 23 Oct 1999 04:50:20 +0000 Subject: [PATCH] Bug 14258, implement Send Page. R=alecf git-svn-id: svn://10.0.0.236/trunk@51634 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/addrbook/resources/content/abCommon.js | 2 +- mozilla/mailnews/compose/public/nsIMsgComposeService.idl | 2 +- .../compose/resources/content/MsgComposeCommands.js | 2 ++ mozilla/mailnews/compose/src/nsMsgComposeService.cpp | 6 ++++-- mozilla/suite/browser/navigator.js | 8 ++++---- mozilla/suite/browser/navigatorOverlay.xul | 2 +- mozilla/xpfe/browser/resources/content/navigator.js | 8 ++++---- .../xpfe/browser/resources/content/navigatorOverlay.xul | 2 +- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/mozilla/mailnews/addrbook/resources/content/abCommon.js b/mozilla/mailnews/addrbook/resources/content/abCommon.js index f53f9991484..c70674cb31b 100644 --- a/mozilla/mailnews/addrbook/resources/content/abCommon.js +++ b/mozilla/mailnews/addrbook/resources/content/abCommon.js @@ -172,7 +172,7 @@ function AbNewMessage() msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMsgComposeService); msgComposeService.OpenComposeWindowWithValues(null, 0, GetSelectedAddresses(), null, null, - null, null, null); + null, null, null, null); } function GetSelectedAddresses() diff --git a/mozilla/mailnews/compose/public/nsIMsgComposeService.idl b/mozilla/mailnews/compose/public/nsIMsgComposeService.idl index 002c9f9234c..8d93d25709f 100644 --- a/mozilla/mailnews/compose/public/nsIMsgComposeService.idl +++ b/mozilla/mailnews/compose/public/nsIMsgComposeService.idl @@ -37,7 +37,7 @@ interface nsIMsgComposeService : nsISupports { /* ... */ void OpenComposeWindowWithValues(in wstring msgComposeWindowURL, in MSG_ComposeFormat format, in wstring to, in wstring cc, in wstring bcc, in wstring newsgroups, - in wstring subject, in wstring body); + in wstring subject, in wstring body, in wstring attachment); /* ... */ void OpenComposeWindowWithCompFields(in wstring msgComposeWindowURL, in MSG_ComposeFormat format, in nsIMsgCompFields compFields); diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js index 9f3eb5c7e65..a208aa83133 100644 --- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js +++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js @@ -217,6 +217,8 @@ function ComposeStartup() msgCompFields.SetNewsgroups(args.newsgroups); if (args.subject) msgCompFields.SetSubject(args.subject); + if (args.attachment) + msgCompFields.SetAttachments(args.attachment); var subjectValue = msgCompFields.GetSubject(); if (subjectValue != "") { diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 3b44b3e7a2c..b518608b88c 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -152,7 +152,8 @@ nsresult nsMsgComposeService::OpenComposeWindowWithValues(const PRUnichar *msgCo const PRUnichar *bcc, const PRUnichar *newsgroups, const PRUnichar *subject, - const PRUnichar *body) + const PRUnichar *body, + const PRUnichar *attachment) { nsAutoString args = ""; nsresult rv; @@ -165,7 +166,8 @@ nsresult nsMsgComposeService::OpenComposeWindowWithValues(const PRUnichar *msgCo if (bcc) {args.Append(",bcc="); args.Append(bcc);} if (newsgroups) {args.Append(",newsgroups="); args.Append(newsgroups);} if (subject) {args.Append(",subject="); args.Append(subject);} - if (body) {args.Append(",body="); args.Append(body);} + if (attachment) {args.Append(",attachment="); args.Append(attachment);} + if (body) {args.Append(",body="); args.Append(body);} //Body need to be the last one! if (msgComposeWindowURL && *msgComposeWindowURL) rv = openWindow( msgComposeWindowURL, args.GetUnicode() ); diff --git a/mozilla/suite/browser/navigator.js b/mozilla/suite/browser/navigator.js index c71e9be82ef..5f86103b5bd 100644 --- a/mozilla/suite/browser/navigator.js +++ b/mozilla/suite/browser/navigator.js @@ -942,12 +942,12 @@ function OpenSearch(tabName, searchStr) window.open("chrome://addressbook/content/", "_blank", "chrome,menubar,toolbar,resizable"); } - function MsgNewMessage() + function BrowserSendPage(pageUrl, pageTitle) { - // Open message compose window. - window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no", "" ); + window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no", + "attachment=" + pageUrl + ",body=" + pageUrl + ",subject='" + pageTitle + "'"); } - + function BrowserViewSource() { dump("BrowserViewSource(); \n "); diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul index 519759becb0..77425c32444 100644 --- a/mozilla/suite/browser/navigatorOverlay.xul +++ b/mozilla/suite/browser/navigatorOverlay.xul @@ -93,7 +93,7 @@ Contributor(s): ______________________________________. --> - + diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js index c71e9be82ef..5f86103b5bd 100644 --- a/mozilla/xpfe/browser/resources/content/navigator.js +++ b/mozilla/xpfe/browser/resources/content/navigator.js @@ -942,12 +942,12 @@ function OpenSearch(tabName, searchStr) window.open("chrome://addressbook/content/", "_blank", "chrome,menubar,toolbar,resizable"); } - function MsgNewMessage() + function BrowserSendPage(pageUrl, pageTitle) { - // Open message compose window. - window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no", "" ); + window.openDialog( "chrome://messengercompose/content/", "_blank", "chrome,all,dialog=no", + "attachment=" + pageUrl + ",body=" + pageUrl + ",subject='" + pageTitle + "'"); } - + function BrowserViewSource() { dump("BrowserViewSource(); \n "); diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul index 519759becb0..77425c32444 100644 --- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul +++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul @@ -93,7 +93,7 @@ Contributor(s): ______________________________________. --> - +