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

Merge pull request #776 from jonathanKingston/context-menu-neaten

Browse source 
Add move and hide to context menu and neaten using checkboxes. Fixes …
This commit is contained in:
luke crouch 2017-08-30 15:48:38 -05:00 • committed by GitHub
commit 6f54e7ff7f
1 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
webextension/js/background/assignManager.js
View file

@ -1,6 +1,10 @@
const assignManager = { const assignManager = {
MENU_ASSIGN_ID: "open-in-this-container", MENU_ASSIGN_ID: "open-in-this-container",
MENU_REMOVE_ID: "remove-open-in-this-container", MENU_REMOVE_ID: "remove-open-in-this-container",
MENU_SEPARATOR_ID: "separator",
MENU_HIDE_ID: "hide-container",
MENU_MOVE_ID: "move-to-new-window-container",
storageArea: { storageArea: {
area: browser.storage.local, area: browser.storage.local,
exemptedTabs: {}, exemptedTabs: {},
@ -163,15 +167,31 @@ const assignManager = {
async _onClickedHandler(info, tab) { async _onClickedHandler(info, tab) {
const userContextId = this.getUserContextIdFromCookieStore(tab); const userContextId = this.getUserContextIdFromCookieStore(tab);
// Mapping ${URL(info.pageUrl).hostname} to ${userContextId} // Mapping ${URL(info.pageUrl).hostname} to ${userContextId}
let remove;
if (userContextId) { if (userContextId) {
// let actionName; switch (info.menuItemId) {
let remove; case this.MENU_ASSIGN_ID:
if (info.menuItemId === this.MENU_ASSIGN_ID) { case this.MENU_REMOVE_ID:
remove = false; if (info.menuItemId === this.MENU_ASSIGN_ID) {
} else { remove = false;
remove = true; } else {
remove = true;
}
await this._setOrRemoveAssignment(tab.id, info.pageUrl, userContextId, remove);
break;
case this.MENU_MOVE_ID:
backgroundLogic.moveTabsToWindow({
cookieStoreId: tab.cookieStoreId,
windowId: tab.windowId,
});
break;
case this.MENU_HIDE_ID:
backgroundLogic.hideTabs({
cookieStoreId: tab.cookieStoreId,
windowId: tab.windowId,
});
break;
} }
await this._setOrRemoveAssignment(tab.id, info.pageUrl, userContextId, remove);
} }
}, },
@ -260,6 +280,9 @@ const assignManager = {
// 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); browser.contextMenus.remove(this.MENU_ASSIGN_ID);
browser.contextMenus.remove(this.MENU_REMOVE_ID); browser.contextMenus.remove(this.MENU_REMOVE_ID);
browser.contextMenus.remove(this.MENU_SEPARATOR_ID);
browser.contextMenus.remove(this.MENU_HIDE_ID);
browser.contextMenus.remove(this.MENU_MOVE_ID);
}, },
async calculateContextMenu(tab) { async calculateContextMenu(tab) {
@ -270,19 +293,37 @@ const assignManager = {
if (siteSettings === false) { if (siteSettings === false) {
return false; return false;
} }
// ✓ This is to mitigate https://bugzilla.mozilla.org/show_bug.cgi?id=1351418 let checked = false;
let prefix = " "; // Alignment of non breaking space, unknown why this requires so many spaces to align with the tick
let menuId = this.MENU_ASSIGN_ID; let menuId = this.MENU_ASSIGN_ID;
const tabUserContextId = this.getUserContextIdFromCookieStore(tab); const tabUserContextId = this.getUserContextIdFromCookieStore(tab);
if (siteSettings && if (siteSettings &&
Number(siteSettings.userContextId) === Number(tabUserContextId)) { Number(siteSettings.userContextId) === Number(tabUserContextId)) {
prefix = "✓"; checked = true;
menuId = this.MENU_REMOVE_ID; menuId = this.MENU_REMOVE_ID;
} }
browser.contextMenus.create({ browser.contextMenus.create({
id: menuId, id: menuId,
title: `${prefix} Always Open in This Container`, title: "Always Open in This Container",
checked: true, checked,
type: "checkbox",
contexts: ["all"],
});
browser.contextMenus.create({
id: this.MENU_SEPARATOR_ID,
type: "separator",
contexts: ["all"],
});
browser.contextMenus.create({
id: this.MENU_HIDE_ID,
title: "Hide This Container",
contexts: ["all"],
});
browser.contextMenus.create({
id: this.MENU_MOVE_ID,
title: "Move Tabs to a New Window",
contexts: ["all"], contexts: ["all"],
}); });
}, },