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

Update options page when permissions change (Jira 682, 686, 680)

Browse source
This commit is contained in:
Lesley Norton 2021-12-08 15:49:13 -06:00
parent 8e51ea0134
commit 1f5245b0bc
No known key found for this signature in database
GPG key ID: E98FBAEE3F13956E
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/js/options.js
View file

@ -1,30 +1,31 @@
const NUMBER_OF_KEYBOARD_SHORTCUTS = 10; const NUMBER_OF_KEYBOARD_SHORTCUTS = 10;
document.querySelectorAll("[data-permission-id]").forEach( async(el) => { async function setUpCheckBoxes() {
document.querySelectorAll("[data-permission-id]").forEach(async(el) => {
const permissionId = el.dataset.permissionId;
const permissionEnabled = await browser.permissions.contains({ permissions: [permissionId] });
el.checked = !!permissionEnabled;
});
}
document.querySelectorAll("[data-permission-id").forEach(async(el) => {
const permissionId = el.dataset.permissionId; const permissionId = el.dataset.permissionId;
const permissionEnabled = await browser.permissions.contains({ permissions: [permissionId] });
el.checked = !!permissionEnabled;
el.addEventListener("change", async() => { el.addEventListener("change", async() => {
if (el.checked) { if (el.checked) {
const granted = await browser.permissions.request({ permissions: [permissionId] }); const granted = await browser.permissions.request({ permissions: [permissionId] });
if (!granted) { if (!granted) {
el.checked = false; el.checked = false;
return;
} }
} else { return;
await browser.permissions.remove({ permissions: [permissionId] });
} }
await browser.permissions.remove({ permissions: [permissionId] });
}); });
}); });
async function maybeShowPermissionsWarningIcon() { async function maybeShowPermissionsWarningIcon() {
const bothMozillaVpnPermissionsEnabled = await MozillaVPN.bothPermissionsEnabled(); const bothMozillaVpnPermissionsEnabled = await MozillaVPN.bothPermissionsEnabled();
if (!bothMozillaVpnPermissionsEnabled) { const permissionsWarningEl = document.querySelector(".warning-icon");
const permissionsWarningEl = document.querySelector(".warning-icon"); permissionsWarningEl.classList.toggle("show-warning", !bothMozillaVpnPermissionsEnabled);
if (permissionsWarningEl) {
permissionsWarningEl.classList.add("show-warning");
}
}
} }
async function enableDisableSync() { async function enableDisableSync() {
@ -87,6 +88,14 @@ function resetOnboarding() {
browser.storage.local.set({"onboarding-stage": 0}); browser.storage.local.set({"onboarding-stage": 0});
} }
async function resetPermissionsUi() {
await maybeShowPermissionsWarningIcon();
await setUpCheckBoxes();
}
browser.permissions.onAdded.addListener(resetPermissionsUi);
browser.permissions.onRemoved.addListener(resetPermissionsUi);
document.addEventListener("DOMContentLoaded", setupOptions); document.addEventListener("DOMContentLoaded", setupOptions);
document.querySelector("#syncCheck").addEventListener( "change", enableDisableSync); document.querySelector("#syncCheck").addEventListener( "change", enableDisableSync);
document.querySelector("#replaceTabCheck").addEventListener( "change", enableDisableReplaceTab); document.querySelector("#replaceTabCheck").addEventListener( "change", enableDisableReplaceTab);
@ -96,3 +105,4 @@ for (let i=0; i < NUMBER_OF_KEYBOARD_SHORTCUTS; i++) {
document.querySelector("#open_container_"+i) document.querySelector("#open_container_"+i)
.addEventListener("change", storeShortcutChoice); .addEventListener("change", storeShortcutChoice);
} }
resetPermissionsUi();