Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Mypal] buildHelpMenu() is executed by the shared help menu but not all windows have the AppMenu

master
Fedor 2019-05-20 09:03:07 +03:00
parent d54fa93da9
commit 75ed7f76ff
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
application/palemoon/base/content/utilityOverlay.js
View File

@ -584,10 +584,16 @@ function buildHelpMenu()
var checkForUpdates = document.getElementById("checkForUpdates"); var checkForUpdates = document.getElementById("checkForUpdates");
var appMenuCheckForUpdates = document.getElementById("appmenu_checkForUpdates"); var appMenuCheckForUpdates = document.getElementById("appmenu_checkForUpdates");
var canCheckForUpdates = updates.canCheckForUpdates; var canCheckForUpdates = updates.canCheckForUpdates;
checkForUpdates.setAttribute("disabled", !canCheckForUpdates); checkForUpdates.setAttribute("disabled", !canCheckForUpdates);
appMenuCheckForUpdates.setAttribute("disabled", !canCheckForUpdates);
if (!canCheckForUpdates) if (appMenuCheckForUpdates) {
appMenuCheckForUpdates.setAttribute("disabled", !canCheckForUpdates);
}
if (!canCheckForUpdates) {
return; return;
}
var strings = document.getElementById("bundle_browser"); var strings = document.getElementById("bundle_browser");
var activeUpdate = um.activeUpdate; var activeUpdate = um.activeUpdate;
@ -623,19 +629,31 @@ function buildHelpMenu()
} }
checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key); checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
appMenuCheckForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
if (appMenuCheckForUpdates) {
appMenuCheckForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
}
// updatesItem_default.accesskey, updatesItem_downloading.accesskey, // updatesItem_default.accesskey, updatesItem_downloading.accesskey,
// updatesItem_resume.accesskey or updatesItem_pending.accesskey // updatesItem_resume.accesskey or updatesItem_pending.accesskey
checkForUpdates.accessKey = strings.getString("updatesItem_" + key + checkForUpdates.accessKey = strings.getString("updatesItem_" + key +
".accesskey"); ".accesskey");
appMenuCheckForUpdates.accessKey = strings.getString("updatesItem_" + key +
".accesskey"); if (appMenuCheckForUpdates) {
appMenuCheckForUpdates.accessKey = strings.getString("updatesItem_" + key +
".accesskey");
}
if (um.activeUpdate && updates.isDownloading) { if (um.activeUpdate && updates.isDownloading) {
checkForUpdates.setAttribute("loading", "true"); checkForUpdates.setAttribute("loading", "true");
appMenuCheckForUpdates.setAttribute("loading", "true"); if (appMenuCheckForUpdates) {
appMenuCheckForUpdates.setAttribute("loading", "true");
}
} else { } else {
checkForUpdates.removeAttribute("loading"); checkForUpdates.removeAttribute("loading");
appMenuCheckForUpdates.removeAttribute("loading"); if (appMenuCheckForUpdates) {
appMenuCheckForUpdates.removeAttribute("loading");
}
} }
#else #else
#ifndef XP_MACOSX #ifndef XP_MACOSX