fix: options not restored/saved

igorlogius · Apr 2, 2024 · df3bab1 · df3bab1
1 parent 8242898
commit df3bab1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/background.js b/background.js
@@ -71,7 +71,11 @@ async function buildRegExList() {
 
 async function getFromStorage(type, id, fallback) {
   let tmp = await browser.storage.local.get(id);
-  return typeof tmp[id] === type ? tmp[id] : fallback;
+  if (typeof tmp[id] === type) {
+    return tmp[id];
+  }
+  await setToStorage(id, fallback);
+  return fallback;
 }
 
 async function setToStorage(id, value) {

diff --git a/manifest.json b/manifest.json
@@ -36,5 +36,5 @@
     "tabs"
   ],
   "optional_permissions": ["bookmarks", "history"],
-  "version": "1.1.30"
+  "version": "1.1.31"
 }
diff --git a/options.html b/options.html
@@ -33,14 +33,14 @@ <h4>
       <abbr title="Hold CTRL to select or deselect multiple colors">(?)</abbr>
     </h4>
     <select id="usecolors" multiple style="min-height: 13em; width: 100%">
-      <option value="blue" selected>blue</option>
-      <option value="turquoise" selected>turquoise</option>
-      <option value="green" selected>green</option>
-      <option value="yellow" selected>yellow</option>
-      <option value="orange" selected>orange</option>
-      <option value="red" selected>red</option>
-      <option value="pink" selected>pink</option>
-      <option value="purple" selected>purple</option>
+      <option value="blue">blue</option>
+      <option value="turquoise">turquoise</option>
+      <option value="green">green</option>
+      <option value="yellow">yellow</option>
+      <option value="orange">orange</option>
+      <option value="red">red</option>
+      <option value="pink">pink</option>
+      <option value="purple">purple</option>
     </select>
   </fieldset>
 

diff --git a/options.js b/options.js
@@ -57,9 +57,11 @@ function onChange(evt) {
       let el = document.getElementById(id);
       let val = obj[id];
 
-      if (Array.isArray(val) && val.length > 0) {
-        for (var i = 0; i < el.options.length; i++) {
+      for (var i = 0; i < el.options.length; i++) {
+        if (Array.isArray(val)) {
           el.options[i].selected = val.includes(el.options[i].value);
+        } else {
+          el.options[i].selected = val == el.options[i].value;
         }
       }
     })