Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-07-30 11:53:50 +08:00
commit 1ce27d8eb2
3 changed files with 4 additions and 4 deletions

View file

@ -27,7 +27,7 @@
#endif
<menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
<menuitem id="menu_openHelp"
oncommand="openHelpLink('firefox-help')"
oncommand="openHelpLink('pale-moon-help')"
onclick="checkForMiddleClick(this, event);"
label="&productHelp.label;"
accesskey="&productHelp.accesskey;"

View file

@ -340,11 +340,11 @@
</splitmenu>
<splitmenu id="appmenu_help"
label="&helpMenu.label;"
oncommand="openHelpLink('firefox-help')">
oncommand="openHelpLink('pale-moon-help')">
<menupopup id="appmenu_helpMenupopup" onpopupshowing="buildHelpMenu();">
<menuitem id="appmenu_openHelp"
label="&helpMenu.label;"
oncommand="openHelpLink('firefox-help')"
oncommand="openHelpLink('pale-moon-help')"
onclick="checkForMiddleClick(this, event);"/>
<menuitem id="appmenu_troubleshootingInfo"
label="&helpTroubleshootingInfo.label;"

View file

@ -1539,7 +1539,7 @@ function HandleAppCommandEvent(evt) {
gFindBar.onFindCommand();
break;
case "Help":
openHelpLink('firefox-help');
openHelpLink('pale-moon-help');
break;
case "Open":
BrowserOpenFileWindow();