change default colour sync

flagrama · May 25, 2017 · 1bb04d8 · 1bb04d8
1 parent f2997d9
commit 1bb04d8
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/options.js b/options.js
@@ -15,7 +15,7 @@ function saveOptions(e) {
   e.preventDefault();
 
   const colours = Object.keys(Settings.defaults.colours)
-    .map(id => ([id, $(`#${id}`).value]))
+    .map(id => [id, $(`#${id}`).value])
     .reduce((o, [key, val]) => {
       o[key] = val;
       return o;
@@ -30,14 +30,11 @@ function saveOptions(e) {
 }
 
 function restoreOptions() {
-  Object.entries(Settings.defaults.colours)
-    .forEach(([key, val]) => $(`#${key}`).value = val);
   Settings.fetch().then(res => {
     $("#refresh").value = res.refreshTime || 60;
-    if (res.colours) {
-      Object.entries(res.colours)
-        .forEach(([key, val]) => $(`#${key}`).value = val);
-    }
+    const colours = res.colours || Settings.defaults.colours || {};
+    Object.entries(colours)
+      .forEach(([key, val]) => $(`#${key}`).value = val);
   });
 }