From 27d7e22add2f87a66b3a0f2e06b6ecaf6ef82427 Mon Sep 17 00:00:00 2001 From: BPower0036 <80090789+BPower0036@users.noreply.github.com> Date: Mon, 8 Aug 2022 07:54:20 +0000 Subject: [PATCH] Use a different `l10n` string for sites opened in no container https://github.com/mozilla/multi-account-containers/pull/2391 --- src/js/confirm-page.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/js/confirm-page.js b/src/js/confirm-page.js index 21a445c..bb153a3 100644 --- a/src/js/confirm-page.js +++ b/src/js/confirm-page.js @@ -12,22 +12,39 @@ async function load() { denySubmit(redirectUrl); }); + document.getElementById("deny-no-container").addEventListener("click", (e) => { + e.preventDefault(); + denySubmit(redirectUrl); + }); + const container = await browser.contextualIdentities.get(cookieStoreId); const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null; - const currentContainerName = currentContainer ? currentContainer.name : ""; + const currentContainerName = currentContainer ? setDenyButton(currentContainer.name) : setDenyButton(""); document.querySelectorAll("[data-message-id]").forEach(el => { const elementData = el.dataset; const containerName = elementData.messageArg === "container-name" ? container.name : currentContainerName; el.textContent = browser.i18n.getMessage(elementData.messageId, containerName); }); - + document.getElementById("confirm").addEventListener("click", (e) => { e.preventDefault(); confirmSubmit(redirectUrl, cookieStoreId); }); } +function setDenyButton(currentContainerName) { + const buttonDeny = document.getElementById("deny"); + const buttonDenyNoContainer = document.getElementById("deny-no-container"); + + if (currentContainerName) { + buttonDenyNoContainer.style.display = "none"; + return currentContainerName; + } + buttonDeny.style.display = "none"; + return; +} + function appendFavicon(pageUrl, redirectUrlElement) { const origin = new URL(pageUrl).origin; const favIconElement = Utils.createFavIconElement(`${origin}/favicon.ico`);