From 35ca0f35dd2cfea3223e5a38d5465002dd54993b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 6 Sep 2019 20:49:12 -0400
Subject: Create common function for utilBackend().options

---
 ext/bg/js/api.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'ext/bg/js')

diff --git a/ext/bg/js/api.js b/ext/bg/js/api.js
index b8ef4362..7126cab7 100644
--- a/ext/bg/js/api.js
+++ b/ext/bg/js/api.js
@@ -21,12 +21,16 @@ async function apiOptionsSet(options) {
     utilBackend().onOptionsUpdated(options);
 }
 
-async function apiOptionsGet() {
+function apiOptionsGetSync() {
     return utilBackend().options;
 }
 
+async function apiOptionsGet() {
+    return apiOptionsGetSync();
+}
+
 async function apiTermsFind(text) {
-    const options = utilBackend().options;
+    const options = apiOptionsGetSync();
     const translator = utilBackend().translator;
 
     const searcher = {
@@ -48,13 +52,13 @@ async function apiTermsFind(text) {
 }
 
 async function apiKanjiFind(text) {
-    const options = utilBackend().options;
+    const options = apiOptionsGetSync();
     const definitions = await utilBackend().translator.findKanji(text, dictEnabledSet(options));
     return definitions.slice(0, options.general.maxResults);
 }
 
 async function apiDefinitionAdd(definition, mode, context) {
-    const options = utilBackend().options;
+    const options = apiOptionsGetSync();
 
     if (mode !== 'kanji') {
         await audioInject(
@@ -83,7 +87,7 @@ async function apiDefinitionsAddable(definitions, modes) {
         const notes = [];
         for (const definition of definitions) {
             for (const mode of modes) {
-                const note = await dictNoteFormat(definition, mode, utilBackend().options);
+                const note = await dictNoteFormat(definition, mode, apiOptionsGetSync());
                 notes.push(note);
             }
         }
@@ -131,7 +135,7 @@ async function apiCommandExec(command) {
         },
 
         toggle: async () => {
-            const options = utilBackend().options;
+            const options = apiOptionsGetSync();
             options.general.enable = !options.general.enable;
             await optionsSave(options);
             await apiOptionsSet(options);
-- 
cgit v1.2.3