Add option to enable/disable Container Tabs

Author: aaronkollasch

src/bg/main.js

@@ -250,8 +250,7 @@
     },
 
     getPolicy(cookieStoreId){
-//       debug("get policy", cookieStoreId, ns.policy, ns.contextStore);
-      if (ns.contextStore.policies.hasOwnProperty(cookieStoreId)) {
+      if (ns.contextStore.enabled && ns.contextStore.policies.hasOwnProperty(cookieStoreId)) {
         let currentPolicy = ns.contextStore.policies[cookieStoreId];
         debug("id", cookieStoreId, "has cookiestore", currentPolicy);
         if (currentPolicy) return currentPolicy;

src/nscl

@@ -57,6 +57,9 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle">__MSG_SectionGeneral_
   <span id="cascadeRestrictions-opt">
   <input type="checkbox" class="enforcement_required" id="opt-cascadeRestrictions"><label for="opt-cascadeRestrictions" id="lbl-cascadeRestrictions">__MSG_CascadeRestrictions__</label>
   </span>
+  <span id="containers-opt">
+  <input type="checkbox" class="enforcement_required" id="opt-containers"><label for="opt-containers" id="lbl-containers">Enable support for container tabs</label>
+  </span>
   </div>
 
   <fieldset class="enforcement_required">

src/ui/options.html

@@ -57,6 +57,16 @@
 
   opt("cascadeRestrictions");
 
+  opt("containers", async o => {
+    if (o) {
+      contextStore.enabled = o.checked;
+      await contextStore.updateContainers(policy);
+      UI.updateSettings({contextStore});
+    }
+    updateContainersEnabled();
+    return contextStore.enabled;
+  })
+
   opt("xss");
 
   opt("overrideTorBrowserPolicy");
@@ -175,9 +185,15 @@
   var cookieStoreId = containerSelect.value;
   var currentPolicy = await UI.getPolicy(cookieStoreId);
 
-  containerSelect.hidden = !browser.contextualIdentities;
-  document.querySelector("#select-container-label").hidden = containerSelect.hidden;
-  if (!browser.contextualIdentities) document.querySelector("#per-site-buttons").style.display = "none";
+  function updateContainersEnabled() {
+    let containersEnabled = Boolean(contextStore.enabled && browser.contextualIdentities);
+    document.querySelector("#opt-containers").disabled = !browser.contextualIdentities;
+    document.querySelector("#opt-containers").checked = contextStore.enabled;
+    document.querySelector("#select-container").hidden = !containersEnabled;
+    document.querySelector("#select-container-label").hidden = !containersEnabled;
+    document.querySelector("#per-site-buttons").style.display = containersEnabled? "flex" : "none";
+  }
+  updateContainersEnabled();
 
   async function changeContainer() {
     cookieStoreId = containerSelect.value;
@@ -205,7 +221,7 @@
   containerCopy.onchange = copyContainer;
 
   var containers = [];
-  async function updateContainers() {
+  async function updateContainerOptions() {
     let newContainers = [{cookieStoreId: "default", name: "Default"},];
     let identities = browser.contextualIdentities && await browser.contextualIdentities.query({});
     if (identities) {
@@ -223,9 +239,9 @@
     containerSelect.value = cookieStoreId;
     containerCopy.innerHTML = container_options;
   }
-  containerSelect.onfocus = updateContainers;
-  containerCopy.onfocus = updateContainers;
-  await updateContainers();
+  containerSelect.onfocus = updateContainerOptions;
+  containerCopy.onfocus = updateContainerOptions;
+  if (contextStore.enabled) await updateContainerOptions();
 
   UI.onSettings = async () => {
     currentPolicy = await UI.getPolicy(cookieStoreId);

src/ui/options.js

@@ -66,19 +66,6 @@ addEventListener("unload", e => {
       tabId = tab.id;
     }
 
-    if (browser.contextualIdentities){
-      try {
-        let containerName = (await browser.contextualIdentities.get(cookieStoreId)).name;
-        document.querySelector("#container-id").textContent = containerName;
-        debug("found container name", containerName, "for cookieStoreId", cookieStoreId);
-      } catch(err) {
-        document.querySelector("#container-id").textContent = "Default";
-        debug("no container for cookieStoreId", cookieStoreId, "error:", err.message);
-      }
-    } else {
-      document.querySelector("#container-id").style.visibility = 'hidden';
-    }
-
     addEventListener("keydown", e => {
       if (e.code === "Enter") {
         let focused = document.activeElement;
@@ -106,6 +93,19 @@ addEventListener("unload", e => {
       });
     }
 
+    if (UI.contextStore && UI.contextStore.enabled && browser.contextualIdentities) {
+      try {
+        let containerName = (await browser.contextualIdentities.get(cookieStoreId)).name;
+        document.querySelector("#container-id").textContent = containerName;
+        debug("found container name", containerName, "for cookieStoreId", cookieStoreId);
+      } catch(err) {
+        document.querySelector("#container-id").textContent = "Default";
+        debug("no container for cookieStoreId", cookieStoreId, "error:", err.message);
+      }
+    } else {
+      document.querySelector("#container-id").style.visibility = 'hidden';
+    }
+
     await include("/ui/toolbar.js");
     {
       let handlers = {

src/ui/popup.js

@@ -127,8 +127,7 @@ var UI = (() => {
 
     async getPolicy(cookieStoreId) {
       await this.contextStore.updateContainers(this.policy);
-//       debug("get policy", cookieStoreId, this.policy, this.contextStore);
-      if (this.contextStore.policies.hasOwnProperty(cookieStoreId)) {
+      if (this.contextStore.enabled && this.contextStore.policies.hasOwnProperty(cookieStoreId)) {
         let currentPolicy = this.contextStore.policies[cookieStoreId];
         debug("id", cookieStoreId, "has cookiestore", currentPolicy);
         return currentPolicy;
@@ -140,7 +139,6 @@ var UI = (() => {
 
     async replacePolicy(cookieStoreId, policy) {
       await this.contextStore.updateContainers(this.policy);
-//       debug("set policy", cookieStoreId, this.policy, this.contextStore);
       if (this.contextStore.policies.hasOwnProperty(cookieStoreId)) {
         this.contextStore.policies[cookieStoreId] = policy;
         debug("replaced id", cookieStoreId, "with policy", policy);