rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2760 from Rob--W/logspam-contextMenus.remove

Browse source 
Avoid logspam: "Cannot find menu item with id ..."
This commit is contained in:
Danny Colin 2025-04-30 18:09:22 -04:00 • committed by GitHub
commit d82341ce4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/js/background/assignManager.js
View file

@ -483,9 +483,7 @@ window.assignManager = {
}, },
contextualIdentityRemoved(changeInfo) { contextualIdentityRemoved(changeInfo) {
browser.contextMenus.remove( this.removeMenuItem(changeInfo.contextualIdentity.cookieStoreId);
changeInfo.contextualIdentity.cookieStoreId
);
}, },
async _onClickedHandler(info, tab) { async _onClickedHandler(info, tab) {
@ -672,11 +670,11 @@ window.assignManager = {
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=1215376#c16 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1215376#c16
// We also can't change for always private mode // We also can't change for always private mode
// See: https://bugzilla.mozilla.org/show_bug.cgi?id=1352102 // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1352102
browser.contextMenus.remove(this.MENU_ASSIGN_ID); this.removeMenuItem(this.MENU_ASSIGN_ID);
browser.contextMenus.remove(this.MENU_REMOVE_ID); this.removeMenuItem(this.MENU_REMOVE_ID);
browser.contextMenus.remove(this.MENU_SEPARATOR_ID); this.removeMenuItem(this.MENU_SEPARATOR_ID);
browser.contextMenus.remove(this.MENU_HIDE_ID); this.removeMenuItem(this.MENU_HIDE_ID);
browser.contextMenus.remove(this.MENU_MOVE_ID); this.removeMenuItem(this.MENU_MOVE_ID);
}, },
async calculateContextMenu(tab) { async calculateContextMenu(tab) {
@ -850,12 +848,19 @@ window.assignManager = {
}, },
async removeBookmarksMenu() { async removeBookmarksMenu() {
browser.contextMenus.remove(this.OPEN_IN_CONTAINER); this.removeMenuItem(this.OPEN_IN_CONTAINER);
const identities = await browser.contextualIdentities.query({}); const identities = await browser.contextualIdentities.query({});
for (const identity of identities) { for (const identity of identities) {
browser.contextMenus.remove(identity.cookieStoreId); this.removeMenuItem(identity.cookieStoreId);
} }
}, },
removeMenuItem(menuItemId) {
// Callers do not check whether the menu exists before attempting to remove
// it. contextMenus.remove rejects when the menu does not exist, so we need
// to catch and swallow the error to avoid logspam.
browser.contextMenus.remove(menuItemId).catch(() => {});
}
}; };
assignManager.init(); assignManager.init();

4
test/common.js
View file

@ -32,6 +32,10 @@ const buildDom = async ({background = {}, popup = {}}) => {
window.crypto = { window.crypto = {
getRandomValues: arr => crypto.randomBytes(arr.length), getRandomValues: arr => crypto.randomBytes(arr.length),
}; };
// By default, the mock contextMenus.remove() returns undefined;
// Let it return a Promise instead, so that .then() calls chained to
// it (in src/js/background/assignManager.js) do not fail.
window.browser.contextMenus.remove.resolves();
} }
} }
}; };