diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js index c989046..7dbee72 100644 --- a/src/js/background/assignManager.js +++ b/src/js/background/assignManager.js @@ -175,6 +175,7 @@ window.assignManager = { this.storageArea.get(pageUrl).then((siteSettings) => { if (siteSettings) { siteSettings.neverAsk = true; + siteSettings.userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(m.cookieStoreId); this.storageArea.set(pageUrl, siteSettings); } }).catch((e) => { diff --git a/src/js/confirm-page.js b/src/js/confirm-page.js index 1f2a4c4..453e68f 100644 --- a/src/js/confirm-page.js +++ b/src/js/confirm-page.js @@ -7,11 +7,13 @@ async function load() { redirectUrlElement.textContent = redirectUrl; appendFavicon(redirectUrl, redirectUrlElement); + // Option for staying on the previous container document.getElementById("deny").addEventListener("click", (e) => { e.preventDefault(); denySubmit(redirectUrl, currentCookieStoreId); }); + // Option for going to the default container (no container) document.getElementById("deny-no-container").addEventListener("click", (e) => { e.preventDefault(); denySubmit(redirectUrl, currentCookieStoreId); @@ -27,6 +29,7 @@ async function load() { el.textContent = browser.i18n.getMessage(elementData.messageId, containerName); }); + // Option for going to newly selected container document.getElementById("confirm").addEventListener("click", (e) => { e.preventDefault(); confirmSubmit(redirectUrl, cookieStoreId); @@ -59,6 +62,7 @@ function confirmSubmit(redirectUrl, cookieStoreId) { browser.runtime.sendMessage({ method: "neverAsk", neverAsk: true, + cookieStoreId: cookieStoreId, pageUrl: redirectUrl }); } @@ -77,12 +81,13 @@ async function denySubmit(redirectUrl, currentCookieStoreId) { const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null; const neverAsk = document.getElementById("never-ask").checked; - if (neverAsk && !currentContainer) { + if (neverAsk) { await browser.runtime.sendMessage({ method: "neverAsk", neverAsk: true, - defaultContainer: true, - pageUrl: redirectUrl + cookieStoreId: currentCookieStoreId, + pageUrl: redirectUrl, + defaultContainer: !currentContainer }); }