From 8d2b7aeadcef551a18ee0a0fb5ecb2fd6810f699 Mon Sep 17 00:00:00 2001
From: Kendall Werts <kmwerts@gmail.com>
Date: Mon, 7 Oct 2019 19:26:42 -0500
Subject: [PATCH] added extension API check for CUDcolors with try/catch for
 older Firefox versions

---
 src/js/popup.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/js/popup.js b/src/js/popup.js
index 02c8999..7001348 100644
--- a/src/js/popup.js
+++ b/src/js/popup.js
@@ -1013,13 +1013,26 @@ Logic.registerPanel(P_CONTAINER_EDIT, {
     }
   },
 
-  initializeRadioButtons() {
+  async findColorset() {
+    let CUDenabled;
+    try {
+      CUDenabled = await browser.contextualIdentities.CUDcolors();
+    } catch(error) {
+      CUDenabled = false;
+    }
+    return CUDenabled;
+  },
+
+  async initializeRadioButtons() {
     const colorRadioTemplate = (containerColor) => {
       return escaped`<input type="radio" value="${containerColor}" name="container-color" id="edit-container-panel-choose-color-${containerColor}" />
      <label for="edit-container-panel-choose-color-${containerColor}" class="usercontext-icon choose-color-icon" data-identity-icon="circle" data-identity-color="${containerColor}">`;
     };
-    const colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple" ];
-    const CUDcolors = ["black", "CUDorange", "skyblue", "bluegreen", "CUDyellow", "CUDblue", "vermillion", "redpurple" ];
+    let colors = ["blue", "turquoise", "green", "yellow", "orange", "red", "pink", "purple" ];
+    let CUDenabled = await this.findColorset();
+    if (CUDenabled) {
+      colors = ["black", "CUDorange", "skyblue", "bluegreen", "CUDyellow", "CUDblue", "vermillion", "redpurple" ];
+    }
     const colorRadioFieldset = document.getElementById("edit-container-panel-choose-color");
     colors.forEach((containerColor) => {
       const templateInstance = document.createElement("div");