From eb98dfb1a86d42a0ecfe54d8eb978c47aa1c0f8b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 6 Sep 2019 21:23:00 -0400
Subject: [PATCH] Simplify logic for how option updates are propagated

---
 ext/bg/js/api.js     |  4 ----
 ext/bg/js/backend.js | 13 +++++--------
 ext/bg/js/options.js |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index ff54ae81..9839aef5 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -17,10 +17,6 @@
  */
 
 
-async function apiOptionsSet(options) {
-    utilBackend().onOptionsUpdated(options);
-}
-
 function apiOptionsGetSync() {
     return utilBackend().options;
 }
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index f05ae9e6..b3e737da 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -28,7 +28,7 @@ class Backend {
 
     async prepare() {
         await this.translator.prepare();
-        await apiOptionsSet(await optionsLoad());
+        this.onOptionsUpdated(await optionsLoad());
 
         if (chrome.commands !== null && typeof chrome.commands === 'object') {
             chrome.commands.onCommand.addListener(this.onCommand.bind(this));
@@ -41,7 +41,8 @@ class Backend {
     }
 
     onOptionsUpdated(options) {
-        this.options = utilIsolate(options);
+        options = utilIsolate(options);
+        this.options = options;
 
         if (!options.general.enable) {
             this.setExtensionBadgeBackgroundColor('#555555');
@@ -53,11 +54,7 @@ class Backend {
             this.setExtensionBadgeText('');
         }
 
-        if (options.anki.enable) {
-            this.anki = new AnkiConnect(options.anki.server);
-        } else {
-            this.anki = new AnkiNull();
-        }
+        this.anki = options.anki.enable ? new AnkiConnect(options.anki.server) : new AnkiNull();
 
         const callback = () => this.checkLastError(chrome.runtime.lastError);
         chrome.tabs.query({}, tabs => {
@@ -144,7 +141,7 @@ class Backend {
             chrome.browserAction.setBadgeBackgroundColor({color});
         }
     }
-    
+
     setExtensionBadgeText(text) {
         if (typeof chrome.browserAction.setBadgeText === 'function') {
             chrome.browserAction.setBadgeText({text});
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 0e871567..69c662e6 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -346,6 +346,6 @@ function optionsSave(options) {
     return new Promise((resolve) => {
         chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
     }).then(() => {
-        apiOptionsSet(options);
+        utilBackend().onOptionsUpdated(options);
     });
 }