Support browsers without contextualIdentities API

Author: aaronkollasch

src/nscl

@@ -68,7 +68,7 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle">__MSG_SectionGeneral_
 
 <h3 class="flextabs__tab"><button class="flextabs__toggle enforcement_required">__MSG_SectionSitePermissions__</button></h3>
 <div class="flextabs__content">
-  <label for="select-container">Choose a container:</label>
+  <label for="select-container" id="select-container-label">Choose a container:</label>
   <select name="select-container" id="select-container">
     <option value="default">Default</option>
   </select>
@@ -82,7 +82,7 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle enforcement_required">
   	   <div class="cssload-whirlpool"></div>
     </div>
   </div>
-  <div class="per-site-buttons">
+  <div class="per-site-buttons" id="per-site-buttons">
     <label for="copy-container" id="copy-container-label">Copy permissions from container:</label>
     <select name="copy-container" id="copy-container">
       <option value="default">Default</option>
@@ -159,12 +159,14 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle">__MSG_SectionAdvanced
   <div id="policy-error"></div>
   <textarea id="policy" class="browser-style">
   </textarea>
+  <div id="edit-context-store">
   <label for="contextStore">ContextStore:</label>
   <div id="context-store-error"></div>
   <textarea id="context-store" class="browser-style">
   </textarea>
   </div>
   </div>
+  </div>
   </section>
 </div>
 </div>

src/ui/options.html

@@ -175,6 +175,10 @@
   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";
+
   async function changeContainer() {
     cookieStoreId = containerSelect.value;
     currentPolicy = await UI.getPolicy(cookieStoreId);
@@ -205,10 +209,12 @@
   var containers = [];
   async function updateContainers() {
     let newContainers = [{cookieStoreId: "default", name: "Default"},];
-    let identities = await browser.contextualIdentities.query({});
-    identities.forEach(({cookieStoreId, name}) => {
-      newContainers.push({cookieStoreId, name});
-    })
+    let identities = browser.contextualIdentities && await browser.contextualIdentities.query({});
+    if (identities) {
+      identities.forEach(({cookieStoreId, name}) => {
+        newContainers.push({cookieStoreId, name});
+      })
+    }
     if (JSON.stringify(newContainers) == JSON.stringify(containers)) return;
     containers = newContainers;
     var container_options = ""
@@ -307,6 +313,10 @@
     if (!UI.local.debug) return;
 
     // RAW POLICY EDITING (debug only)
+    if (!browser.contextualIdentities) {
+      document.querySelector("#edit-context-store").style.display = "none";
+      return;
+    }
     let contextStoreEditor = document.getElementById("context-store");
     contextStoreEditor.value = JSON.stringify(contextStore.dry(true), null, 2);
     if (!contextStoreEditor.onchange) contextStoreEditor.onchange = (e) => {

src/ui/options.js

@@ -66,13 +66,17 @@ addEventListener("unload", e => {
       tabId = tab.id;
     }
 
-    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) {
+    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';
-      debug("no container for cookieStoreId", cookieStoreId, "error:", err.message);
     }
 
     addEventListener("keydown", e => {