зеркало из https://github.com/mozilla/gecko-dev.git
other header in compose feature, from dmose@netscape.com and endico@netscape.com.
This commit is contained in:
Родитель
22715d631f
Коммит
3fb2c848ca
|
@ -23,12 +23,14 @@ msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMs
|
|||
var msgCompose = null;
|
||||
var MAX_RECIPIENTS = 0;
|
||||
|
||||
var other_header = "";
|
||||
var update_compose_title_as_you_type = true;
|
||||
var prefs = Components.classes["component://netscape/preferences"].getService();
|
||||
if (prefs) {
|
||||
prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
|
||||
if (prefs) {
|
||||
update_compose_title_as_you_type = prefs.GetBoolPref("mail.update_compose_title_as_you_type");
|
||||
other_header = prefs.CopyCharPref("mail.compose.other.header");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -181,6 +183,17 @@ function ComposeStartup()
|
|||
}
|
||||
}
|
||||
|
||||
function ComposeLoad()
|
||||
{
|
||||
dump("\nComposeLoad from XUL\n");
|
||||
var selectNode = document.getElementById('msgRecipientType#1');
|
||||
|
||||
if (other_header != "") {
|
||||
var opt = new Option(other_header + ":", "addr_other");
|
||||
selectNode.add(opt, null);
|
||||
}
|
||||
}
|
||||
|
||||
function ComposeUnload(calledFromExit)
|
||||
{
|
||||
dump("\nComposeUnload from XUL\n");
|
||||
|
@ -441,6 +454,7 @@ function Recipients2CompFields(msgCompFields)
|
|||
var addrReply = "";
|
||||
var addrNg = "";
|
||||
var addrFollow = "";
|
||||
var addrOther = "";
|
||||
var to_Sep = "";
|
||||
var cc_Sep = "";
|
||||
var bcc_Sep = "";
|
||||
|
@ -461,6 +475,7 @@ function Recipients2CompFields(msgCompFields)
|
|||
case "addr_reply" : addrReply += reply_Sep + fieldValue; reply_Sep = ","; break;
|
||||
case "addr_newsgroups" : addrNg += ng_Sep + fieldValue; ng_Sep = ","; break;
|
||||
case "addr_followup" : addrFollow += follow_Sep + fieldValue; follow_Sep = ","; break;
|
||||
case "addr_other" : addrOther += other_header + ": " + fieldValue + "\n"; break;
|
||||
}
|
||||
}
|
||||
i ++;
|
||||
|
@ -471,6 +486,7 @@ function Recipients2CompFields(msgCompFields)
|
|||
msgCompFields.SetReplyTo(addrReply);
|
||||
msgCompFields.SetNewsgroups(addrNg);
|
||||
msgCompFields.SetFollowupTo(addrFollow);
|
||||
msgCompFields.SetOtherRandomHeaders(addrOther);
|
||||
}
|
||||
else
|
||||
dump("Message Compose Error: msgCompFields is null (ExtractRecipients)");
|
||||
|
@ -513,6 +529,14 @@ function CompFields2Recipients(msgCompFields)
|
|||
i ++;
|
||||
}
|
||||
|
||||
fieldValue = msgCompFields.GetOtherRandomHeaders();
|
||||
if (fieldValue != "")
|
||||
{
|
||||
document.getElementById("msgRecipient#" + i).value = fieldValue;
|
||||
document.getElementById("msgRecipientType#" + i).value = "addr_other";
|
||||
i ++;
|
||||
}
|
||||
|
||||
fieldValue = msgCompFields.GetNewsgroups();
|
||||
if (fieldValue != "" && i <= MAX_RECIPIENTS)
|
||||
{
|
||||
|
|
|
@ -29,6 +29,7 @@ Rights Reserved.
|
|||
|
||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
onload="ComposeLoad()"
|
||||
onunload="ComposeUnload()"
|
||||
width="640" height="480"
|
||||
title="&msgComposeWindow.title;"
|
||||
|
|
|
@ -125,6 +125,7 @@ localDefPref("mail.addr_book.locality.pos", -1);
|
|||
localDefPref("mail.addr_book.company.pos", -1);
|
||||
pref("mail.attach_vcard", false);
|
||||
pref("mail.html_compose", true);
|
||||
pref("mail.compose.other.header", "");
|
||||
pref("mail.htmldomains", "netscape.com,mcom.com");
|
||||
pref("mail.play_sound", true);
|
||||
pref("mail.send_html", true);
|
||||
|
|
|
@ -125,6 +125,7 @@ localDefPref("mail.addr_book.locality.pos", -1);
|
|||
localDefPref("mail.addr_book.company.pos", -1);
|
||||
pref("mail.attach_vcard", false);
|
||||
pref("mail.html_compose", true);
|
||||
pref("mail.compose.other.header", "");
|
||||
pref("mail.htmldomains", "netscape.com,mcom.com");
|
||||
pref("mail.play_sound", true);
|
||||
pref("mail.send_html", true);
|
||||
|
|
Загрузка…
Ссылка в новой задаче