fixing bug 114623 - two separators in right-click on url r=racham sr=mscott

This commit is contained in:
ssu%netscape.com 2002-01-08 06:02:24 +00:00
parent 1a9e1652ac
commit 8768465381
2 changed files with 15 additions and 6 deletions

View File

@ -126,6 +126,12 @@ function SetupCopyMenuItem(menuID, numSelected, forceHide)
EnableMenuItem(menuID, (numSelected > 0));
}
function SetupLabelsMenuItem(menuID, numSelected, forceHide)
{
ShowMenuItem(menuID, (numSelected <= 1) && !forceHide);
EnableMenuItem(menuID, (numSelected == 1));
}
function SetupSaveAsMenuItem(menuID, numSelected, forceHide)
{
ShowMenuItem(menuID, (numSelected <= 1) && !forceHide);
@ -357,6 +363,7 @@ function fillMessagePaneContextMenu()
SetupCopyMessageUrlMenuItem("messagePaneContext-copyMessageUrl", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems));
SetupCopyMenuItem("messagePaneContext-copyMenu", numSelected, (numSelected == 0 || hideMailItems));
SetupMoveMenuItem("messagePaneContext-moveMenu", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems));
SetupLabelsMenuItem("messagePaneContext-labels", numSelected, (numSelected == 0 || hideMailItems));
SetupSaveAsMenuItem("messagePaneContext-saveAs", numSelected, (numSelected == 0 || hideMailItems));
SetupPrintMenuItem("messagePaneContext-print", numSelected, (numSelected == 0 || hideMailItems));
SetupDeleteMenuItem("messagePaneContext-delete", numSelected, isNewsgroup, (numSelected == 0 || hideMailItems));
@ -370,6 +377,8 @@ function fillMessagePaneContextMenu()
ShowMenuItem("messagePaneContext-sep-link", ShowSeparator("messagePaneContext-sep-link"));
ShowMenuItem("messagePaneContext-sep-image", ShowSeparator("messagePaneContext-sep-image"));
ShowMenuItem("messagePaneContext-sep-copy", ShowSeparator("messagePaneContext-sep-copy"));
ShowMenuItem("messagePaneContext-sep-labels-1", ShowSeparator("messagePaneContext-sep-labels-1"));
ShowMenuItem("messagePaneContext-sep-labels-2", ShowSeparator("messagePaneContext-sep-labels-2"));
if (!hideMailItems)
ShowMenuItem("messagePaneContext-sep-edit", false);

View File

@ -488,8 +488,8 @@ Rights Reserved.
</template>
</menu>
<menuseparator/>
<menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
<menupopup id="threadPaneContext-labels" onpopupshowing="InitMessageLabel('threadPaneContext')">
<menu id="threadPaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
<menupopup onpopupshowing="InitMessageLabel('threadPaneContext')">
<menuitem
id="threadPaneContext-labelMenuItem0"
accesskey="&labelCmd0.accesskey;"
@ -767,9 +767,9 @@ Rights Reserved.
</rule>
</template>
</menu>
<menuseparator/>
<menu label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
<menupopup id="messagePaneContext-labels" onpopupshowing="InitMessageLabel('messagePaneContext')">
<menuseparator id="messagePaneContext-sep-labels-1"/>
<menu id="messagePaneContext-labels" label="&labelMenu.label;" accesskey="&labelMenu.accesskey;">
<menupopup onpopupshowing="InitMessageLabel('messagePaneContext')">
<menuitem
id="messagePaneContext-labelMenuItem0"
accesskey="&labelCmd0.accesskey;"
@ -797,7 +797,7 @@ Rights Reserved.
observes="cmd_label5"/>
</menupopup>
</menu>
<menuseparator/>
<menuseparator id="messagePaneContext-sep-labels-2"/>
<menuitem id="messagePaneContext-saveAs"
label="&contextSaveAs.label;"
accesskey="&contextSaveAs.accesskey;"