зеркало из https://github.com/mozilla/gecko-dev.git
fix for 79484-new navigator and editor from msgcompose and for selecting the default pref before throwing up the send format dialog;r=ducarroz;sr=sspitzer;sr=mscott
This commit is contained in:
Родитель
b6db40a736
Коммит
6b866ab660
|
@ -24,6 +24,7 @@ var param = null;
|
|||
var defaultAction = msgCompSendFormat.PlainText;
|
||||
var recommended_as_default = true;
|
||||
var display_recommendation = true;
|
||||
var useDefault =false;
|
||||
|
||||
var prefs = Components.classes["@mozilla.org/preferences;1"].getService();
|
||||
if (prefs) {
|
||||
|
@ -31,6 +32,7 @@ if (prefs) {
|
|||
if (prefs) {
|
||||
try {
|
||||
defaultAction = prefs.GetIntPref("mail.asksendformat.default");
|
||||
useDefault = true;
|
||||
} catch (ex) {}
|
||||
try {
|
||||
recommended_as_default = prefs.GetBoolPref("mail.asksendformat.recommended_as_default");
|
||||
|
@ -87,7 +89,13 @@ function Startup()
|
|||
var recommlabels = document.getElementById("hiddenLabels");
|
||||
var label;
|
||||
var haveRecommendation = false;
|
||||
switch (param.action)
|
||||
|
||||
if (useDefault)
|
||||
var radioSelect=defaultAction;
|
||||
else
|
||||
var radioSelect=param.action;
|
||||
|
||||
switch (radioSelect)
|
||||
{
|
||||
case msgCompSendFormat.AskUser:
|
||||
//haveRecommendation = false;
|
||||
|
|
|
@ -88,6 +88,8 @@
|
|||
<commandset id="tasksCommands"/>
|
||||
<command id="cmd_quit"/>
|
||||
<!-- File Menu -->
|
||||
<command id="cmd_newNavigator"/>
|
||||
<command id="cmd_newEditor"/>
|
||||
<command id="cmd_new" oncommand="goDoCommand('cmd_newMessage')"/>
|
||||
<command id="cmd_attachFile" oncommand="goDoCommand('cmd_attachFile')"/>
|
||||
<command id="cmd_attachPage" oncommand="goDoCommand('cmd_attachPage')"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче