зеркало из https://github.com/mozilla/gecko-dev.git
fix for bug #79487 and #81738 -removing format menu items in plaintext compose windows; 86116-auto spellcheck doesnt work all the time; r=ducarroz;sr=sspitzer
This commit is contained in:
Родитель
784f812b4b
Коммит
ffc5ee3c70
|
@ -206,6 +206,7 @@ var defaultController =
|
|||
case "cmd_showFormatToolbar":
|
||||
|
||||
//Insert Menu
|
||||
case "cmd_renderedHTMLEnabler":
|
||||
case "cmd_insert":
|
||||
case "cmd_link":
|
||||
case "cmd_anchor":
|
||||
|
@ -324,6 +325,7 @@ var defaultController =
|
|||
return composeHTML;
|
||||
|
||||
//Insert Menu
|
||||
case "cmd_renderedHTMLEnabler":
|
||||
case "cmd_insert":
|
||||
return !focusedElement;
|
||||
case "cmd_link":
|
||||
|
@ -984,10 +986,11 @@ function ComposeStartup()
|
|||
else
|
||||
{
|
||||
//Remove HTML toolbar, format and insert menus as we are editing in plain text mode
|
||||
document.getElementById("FormatToolbar").setAttribute("hidden", true);
|
||||
document.getElementById("formatMenu").setAttribute("hidden", true);
|
||||
document.getElementById("insertMenu").setAttribute("hidden", true);
|
||||
document.getElementById("menu_showFormatToolbar").setAttribute("checked", false);
|
||||
document.getElementById("outputFormatMenu").setAttribute("hidden", true);
|
||||
document.getElementById("FormatToolbar").setAttribute("hidden", true);
|
||||
document.getElementById("formatMenu").setAttribute("hidden", true);
|
||||
document.getElementById("insertMenu").setAttribute("hidden", true);
|
||||
document.getElementById("menu_showFormatToolbar").setAttribute("hidden", true);
|
||||
|
||||
window.editorShell.editorType = "textmail";
|
||||
// dump("editor initialized in PLAIN TEXT mode\n");
|
||||
|
|
|
@ -338,7 +338,7 @@
|
|||
<!--menuitem label=""eOrigCmd.label;" accesskey=""eOrigCmd.accesskey;" command="cmd_quoteMessage"/-->
|
||||
<menuitem label="&editRewrapCmd.label;" accesskey="&editRewrapCmd.accesskey;" command="cmd_rewrap" oncommand="editorShell.Rewrap(false)"/>
|
||||
<menuseparator/>
|
||||
<menu label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" command="cmd_outputFormat">
|
||||
<menu id="outputFormatMenu" label="&outputFormatMenu.label;" accesskey="&outputFormatMenu.accesskey;" command="cmd_outputFormat">
|
||||
<menupopup>
|
||||
<menuitem type="radio" name="output_format" label="&autoFormatCmd.label;" accesskey="&autoFormatCmd.accesskey;" id="1" checked="true"/>
|
||||
<menuitem type="radio" name="output_format" label="&plainTextFormatCmd.label;" accesskey="&plainTextFormatCmd.accesskey;" id="2"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче