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

fix #2603: remember choice when choosing 'previous' (deny) container option

Browse source
This commit is contained in:
Rafee 2024-08-23 12:12:46 -04:00
parent cd343ab8c3
commit 6bde0a78d7
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,6 +175,7 @@ window.assignManager = {
this.storageArea.get(pageUrl).then((siteSettings) => { this.storageArea.get(pageUrl).then((siteSettings) => {
if (siteSettings) { if (siteSettings) {
siteSettings.neverAsk = true; siteSettings.neverAsk = true;
siteSettings.userContextId = backgroundLogic.getUserContextIdFromCookieStoreId(m.cookieStoreId);
this.storageArea.set(pageUrl, siteSettings); this.storageArea.set(pageUrl, siteSettings);
} }
}).catch((e) => { }).catch((e) => {

11
src/js/confirm-page.js
View file

@ -7,11 +7,13 @@ async function load() {
redirectUrlElement.textContent = redirectUrl; redirectUrlElement.textContent = redirectUrl;
appendFavicon(redirectUrl, redirectUrlElement); appendFavicon(redirectUrl, redirectUrlElement);
// Option for staying on the previous container
document.getElementById("deny").addEventListener("click", (e) => { document.getElementById("deny").addEventListener("click", (e) => {
e.preventDefault(); e.preventDefault();
denySubmit(redirectUrl, currentCookieStoreId); denySubmit(redirectUrl, currentCookieStoreId);
}); });
// Option for going to the default container (no container)
document.getElementById("deny-no-container").addEventListener("click", (e) => { document.getElementById("deny-no-container").addEventListener("click", (e) => {
e.preventDefault(); e.preventDefault();
denySubmit(redirectUrl, currentCookieStoreId); denySubmit(redirectUrl, currentCookieStoreId);
@ -27,6 +29,7 @@ async function load() {
el.textContent = browser.i18n.getMessage(elementData.messageId, containerName); el.textContent = browser.i18n.getMessage(elementData.messageId, containerName);
}); });
// Option for going to newly selected container
document.getElementById("confirm").addEventListener("click", (e) => { document.getElementById("confirm").addEventListener("click", (e) => {
e.preventDefault(); e.preventDefault();
confirmSubmit(redirectUrl, cookieStoreId); confirmSubmit(redirectUrl, cookieStoreId);
@ -59,6 +62,7 @@ function confirmSubmit(redirectUrl, cookieStoreId) {
browser.runtime.sendMessage({ browser.runtime.sendMessage({
method: "neverAsk", method: "neverAsk",
neverAsk: true, neverAsk: true,
cookieStoreId: cookieStoreId,
pageUrl: redirectUrl pageUrl: redirectUrl
}); });
} }
@ -77,12 +81,13 @@ async function denySubmit(redirectUrl, currentCookieStoreId) {
const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null; const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null;
const neverAsk = document.getElementById("never-ask").checked; const neverAsk = document.getElementById("never-ask").checked;
if (neverAsk && !currentContainer) { if (neverAsk) {
await browser.runtime.sendMessage({ await browser.runtime.sendMessage({
method: "neverAsk", method: "neverAsk",
neverAsk: true, neverAsk: true,
defaultContainer: true, cookieStoreId: currentCookieStoreId,
pageUrl: redirectUrl pageUrl: redirectUrl,
defaultContainer: !currentContainer
}); });
} }