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

Address code review from @Rob--W

Browse Source
This commit is contained in:
Stephen Thompson
2025-04-23 14:31:13 -04:00
parent b6a1bff9e8
commit ab3e1ce4d8
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/background/assignManager.js
+2 -10
View File
@@ -1,11 +1,3 @@
/**
* Firefox does not yet have the `tabGroups` API, which exposes this constant
* to indicate that a tab is not in a tab group. But the Firefox `tabs` API
* currently returns this constant value for `Tab.groupId`.
* @see https://searchfox.org/mozilla-central/rev/3b95c8dbe724b10390c96c1b9dd0f12c873e2f2e/browser/components/extensions/schemas/tabs.json#235
*/
const TAB_GROUP_ID_NONE = -1;
window.assignManager = { window.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",
@@ -777,7 +769,7 @@ window.assignManager = {
* @param {number} index * @param {number} index
* @param {boolean} active * @param {boolean} active
* @param {number} openerTabId * @param {number} openerTabId
* @param {number} [groupId] * @param {number} [groupId] Tab group ID
* @returns {Promise<Tab>} * @returns {Promise<Tab>}
*/ */
async createTabWrapper(url, cookieStoreId, index, active, openerTabId, groupId) { async createTabWrapper(url, cookieStoreId, index, active, openerTabId, groupId) {
@@ -789,7 +781,7 @@ window.assignManager = {
openerTabId, openerTabId,
}); });
if (groupId && groupId !== TAB_GROUP_ID_NONE && browser.tabs.group) { if (groupId >= 0) {
// If the original tab was in a tab group, make sure that the reopened tab // If the original tab was in a tab group, make sure that the reopened tab
// stays in the same tab group. // stays in the same tab group.
await browser.tabs.group({ groupId, tabIds: newTab.id }); await browser.tabs.group({ groupId, tabIds: newTab.id });
src/js/confirm-page.js
+3 -11
View File
@@ -1,11 +1,3 @@
/**
* Firefox does not yet have the `tabGroups` API, which exposes this constant
* to indicate that a tab is not in a tab group. But the Firefox `tabs` API
* currently returns this constant value for `Tab.groupId`.
* @see https://searchfox.org/mozilla-central/rev/3b95c8dbe724b10390c96c1b9dd0f12c873e2f2e/browser/components/extensions/schemas/tabs.json#235
*/
const TAB_GROUP_ID_NONE = -1;
async function load() { async function load() {
const searchParams = new URL(window.location).searchParams; const searchParams = new URL(window.location).searchParams;
const redirectUrl = searchParams.get("url"); const redirectUrl = searchParams.get("url");
@@ -120,10 +112,10 @@ async function openInContainer(redirectUrl, cookieStoreId) {
cookieStoreId, cookieStoreId,
url: redirectUrl url: redirectUrl
}); });
if (tab.groupId && tab.groupId !== TAB_GROUP_ID_NONE && browser.tabs.group) { if (tab.groupId >= 0) {
// If the original tab was in a tab group, make sure that the reopened tab // If the original tab was in a tab group, make sure that the reopened tab
// stays in the same tab group. // stays in the same tab group.
browser.tabs.group({ groupId: tab.groupId, tabIds: reopenedTab.id }); await browser.tabs.group({ groupId: tab.groupId, tabIds: reopenedTab.id });
} }
browser.tabs.remove(tab.id); await browser.tabs.remove(tab.id);
} }