From a9fe2d03b22a0dd5760019f1325a7a86ebb07b85 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 3 Apr 2021 13:02:49 -0400
Subject: Update dictionary settings structure (#1587)

* Update dictionary settings structure to use an array instead of an object

* Update ensureDictionarySettings implementation

* Remove some usage of ObjectPropertyAccessor
---
 ext/js/background/backend.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'ext/js/background')

diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
index 0fd083bf..cf8137e5 100644
--- a/ext/js/background/backend.js
+++ b/ext/js/background/backend.js
@@ -1271,6 +1271,17 @@ class Backend {
                 if (!Array.isArray(array)) { throw new Error('Invalid target type'); }
                 return array.splice(start, deleteCount, ...items);
             }
+            case 'push':
+            {
+                const {path, items} = target;
+                if (typeof path !== 'string') { throw new Error('Invalid path'); }
+                if (!Array.isArray(items)) { throw new Error('Invalid items'); }
+                const array = accessor.get(ObjectPropertyAccessor.getPathArray(path));
+                if (!Array.isArray(array)) { throw new Error('Invalid target type'); }
+                const start = array.length;
+                array.push(...items);
+                return start;
+            }
             default:
                 throw new Error(`Unknown action: ${action}`);
         }
@@ -1358,7 +1369,7 @@ class Backend {
     }
 
     _isAnyDictionaryEnabled(options) {
-        for (const {enabled} of Object.values(options.dictionaries)) {
+        for (const {enabled} of options.dictionaries) {
             if (enabled) {
                 return true;
             }
@@ -1900,12 +1911,9 @@ class Backend {
 
     _getTranslatorEnabledDictionaryMap(options) {
         const enabledDictionaryMap = new Map();
-        const {dictionaries} = options;
-        for (const title in dictionaries) {
-            if (!Object.prototype.hasOwnProperty.call(dictionaries, title)) { continue; }
-            const dictionary = dictionaries[title];
+        for (const dictionary of options.dictionaries) {
             if (!dictionary.enabled) { continue; }
-            enabledDictionaryMap.set(title, {
+            enabledDictionaryMap.set(dictionary.name, {
                 index: enabledDictionaryMap.size,
                 priority: dictionary.priority,
                 allowSecondarySearches: dictionary.allowSecondarySearches
-- 
cgit v1.2.3