Fix #2168 Use a different l10n string for sites opened in no container
This commit is contained in:
+1
-1
Submodule src/_locales updated: 26e17db70c...66bcca02c9
+15
-2
@@ -23,8 +23,21 @@
|
|||||||
</label>
|
</label>
|
||||||
<br />
|
<br />
|
||||||
<div class="button-container">
|
<div class="button-container">
|
||||||
<button id="deny" class="button" data-message-id="openInContainer" data-message-arg="current-container-name"></button>
|
<button id="deny"
|
||||||
<button id="confirm" class="button primary" autofocus data-message-id="openInContainer" data-message-arg="container-name"></button>
|
class="button"
|
||||||
|
data-message-id="openInContainer"
|
||||||
|
data-message-arg="current-container-name">
|
||||||
|
</button>
|
||||||
|
<button id="deny-no-container"
|
||||||
|
class="button"
|
||||||
|
data-message-id="openInNoContainer">
|
||||||
|
</button>
|
||||||
|
<button id="confirm"
|
||||||
|
class="button primary"
|
||||||
|
autofocus
|
||||||
|
data-message-id="openInContainer"
|
||||||
|
data-message-arg="container-name">
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
+19
-2
@@ -12,22 +12,39 @@ async function load() {
|
|||||||
denySubmit(redirectUrl);
|
denySubmit(redirectUrl);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
document.getElementById("deny-no-container").addEventListener("click", (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
denySubmit(redirectUrl);
|
||||||
|
});
|
||||||
|
|
||||||
const container = await browser.contextualIdentities.get(cookieStoreId);
|
const container = await browser.contextualIdentities.get(cookieStoreId);
|
||||||
const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null;
|
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 => {
|
document.querySelectorAll("[data-message-id]").forEach(el => {
|
||||||
const elementData = el.dataset;
|
const elementData = el.dataset;
|
||||||
const containerName = elementData.messageArg === "container-name" ? container.name : currentContainerName;
|
const containerName = elementData.messageArg === "container-name" ? container.name : currentContainerName;
|
||||||
el.textContent = browser.i18n.getMessage(elementData.messageId, containerName);
|
el.textContent = browser.i18n.getMessage(elementData.messageId, containerName);
|
||||||
});
|
});
|
||||||
|
|
||||||
document.getElementById("confirm").addEventListener("click", (e) => {
|
document.getElementById("confirm").addEventListener("click", (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
confirmSubmit(redirectUrl, cookieStoreId);
|
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) {
|
function appendFavicon(pageUrl, redirectUrlElement) {
|
||||||
const origin = new URL(pageUrl).origin;
|
const origin = new URL(pageUrl).origin;
|
||||||
const favIconElement = Utils.createFavIconElement(`${origin}/favicon.ico`);
|
const favIconElement = Utils.createFavIconElement(`${origin}/favicon.ico`);
|
||||||
|
|||||||
Reference in New Issue
Block a user