Refining code and design

2 files changed, 54 insertions, 50 deletions

diff --git a/src/pages/options/general/general.html b/src/pages/options/general/general.html
index 8c46c40b..3a7e8cf2 100644
--- a/src/pages/options/general/general.html
+++ b/src/pages/options/general/general.html
@@ -38,8 +38,8 @@
         <span>Update Instances</span>
       </a>
     </div>
-    <hr>
-    <section class="settings-block">
+    <!-- <hr> -->
+    <!-- <section class="settings-block">
       <p data-localise="__MSG_exceptionsDescriptionP1__">
         Enter a URL or Regular Expression to be excluded from redirects.
       </p>
@@ -95,11 +95,11 @@
       </table>
     </section>
     <ul id="exceptions-items"></ul>
-  </section>
+  </section> -->
 
 
-  <script type="module" src="./general.js"></script>
   <script type="module" src="../init.js"></script>
+  <script type="module" src="./general.js"></script>
   <!-- <script src="../../assets/javascripts/localise.js"></script> -->
 </body>
 
diff --git a/src/pages/options/general/general.js b/src/pages/options/general/general.js
index 4f111469..23c739aa 100644
--- a/src/pages/options/general/general.js
+++ b/src/pages/options/general/general.js
@@ -11,66 +11,66 @@ let themeElement = document.getElementById("theme");
 
 window.browser = window.browser || window.chrome;
 
-function prependExceptionsItem(item, index) {
-  const li = document.createElement("li");
-  li.appendChild(document.createTextNode(item.toString()));
-  const button = document.createElement("button");
-  li.appendChild(button);
-  document.getElementById("exceptions-items").prepend(li);
-  const svg = `<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 512 512'>
-      <line x1='368' y1='368' x2='144' y2='144'
-        style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
-      <line x1='368' y1='144' x2='144' y2='368'
-        style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
-    </svg>`;
-  button.appendChild(domparser.parseFromString(svg, "image/svg+xml").documentElement);
-  button.addEventListener("click", () => {
-    exceptions.splice(index, 1);
-    browser.storage.sync.set({ exceptions: exceptions });
-    li.remove();
-  });
-}
+// function prependExceptionsItem(item, index) {
+//   const li = document.createElement("li");
+//   li.appendChild(document.createTextNode(item.toString()));
+//   const button = document.createElement("button");
+//   li.appendChild(button);
+//   document.getElementById("exceptions-items").prepend(li);
+//   const svg = `<svg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 512 512'>
+//       <line x1='368' y1='368' x2='144' y2='144'
+//         style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
+//       <line x1='368' y1='144' x2='144' y2='368'
+//         style='fill:none;stroke:#FFF;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px' />
+//     </svg>`;
+//   button.appendChild(domparser.parseFromString(svg, "image/svg+xml").documentElement);
+//   button.addEventListener("click", () => {
+//     exceptions.splice(index, 1);
+//     browser.storage.sync.set({ exceptions: exceptions });
+//     li.remove();
+//   });
+// }
 
 browser.storage.sync.get(
   [
-    "exceptions",
+    // "exceptions",
     "theme",
   ],
   (result) => {
     data.theme = result.theme || "";
     themeElement.value = result.theme || "";
     if (result.theme) document.body.classList.add(result.theme);
-    data.exceptions = result.exceptions || [];
-    data.exceptions.forEach(prependExceptionsItem);
+    // data.exceptions = result.exceptions || [];
+    // data.exceptions.forEach(prependExceptionsItem);
     shared.autocompletes.forEach((value) => {
     });
   }
 );
 
-function addToExceptions() {
-  const input = document.getElementById("new-exceptions-item");
-  const type = document.querySelector('input[name="type"]:checked').value;
-  if (input.value) {
-    try {
-      let value = input.value;
-      new RegExp(input.value);
-      if (type === "URL")
-        value = value.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
+// function addToExceptions() {
+//   const input = document.getElementById("new-exceptions-item");
+//   const type = document.querySelector('input[name="type"]:checked').value;
+//   if (input.value) {
+//     try {
+//       let value = input.value;
+//       new RegExp(input.value);
+//       if (type === "URL")
+//         value = value.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
 
-      exceptions.push(value);
-      browser.storage.sync.set({
-        exceptions: exceptions,
-      });
-      prependExceptionsItem(value, exceptions.indexOf(value));
-      input.value = "";
-    } catch (error) {
-      input.setCustomValidity("Invalid RegExp");
-    }
-  } else {
-    input.setCustomValidity("Invalid RegExp");
-  }
-}
-document.getElementById("add-to-exceptions").addEventListener("click", addToExceptions);
+//       exceptions.push(value);
+//       browser.storage.sync.set({
+//         exceptions: exceptions,
+//       });
+//       prependExceptionsItem(value, exceptions.indexOf(value));
+//       input.value = "";
+//     } catch (error) {
+//       input.setCustomValidity("Invalid RegExp");
+//     }
+//   } else {
+//     input.setCustomValidity("Invalid RegExp");
+//   }
+// }
+// document.getElementById("add-to-exceptions").addEventListener("click", addToExceptions);
 
 themeElement.addEventListener("change", (event) => {
   const value = event.target.options[theme.selectedIndex].value;
@@ -92,8 +92,12 @@ themeElement.addEventListener("change", (event) => {
 
 document.querySelector("#update-instances").addEventListener("click", () => {
   document.querySelector("#update-instances").innerHTML = '...';
-  if (commonHelper.updateInstances())
+  if (commonHelper.updateInstances()) {
     document.querySelector("#update-instances").innerHTML = 'Done!';
+    new Promise(resolve => setTimeout(resolve, 1500)).then( // Sleep 1500ms
+      () => document.querySelector("#update-instances").innerHTML = 'Update Instances'
+    )
+  }
   else
     document.querySelector("#update-instances").innerHTML = 'Failed Miserabely';
 });