summaryrefslogtreecommitdiff
path: root/ext/bg
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-12-11 20:20:53 -0500
committertoasted-nutbread <toasted-nutbread@users.noreply.github.com>2019-12-13 23:11:56 -0500
commit17277a645020bf13bef9aaf1c1292f2b1a7cea02 (patch)
tree6ed6198703d541948b061d85a74e3de64552494a /ext/bg
parentce51fe7eca2e893c8631c62ccb39ce3921ad1b6b (diff)
Remove getOptionsArray
Diffstat (limited to 'ext/bg')
-rw-r--r--ext/bg/js/settings/dictionaries.js4
-rw-r--r--ext/bg/js/settings/main.js5
2 files changed, 2 insertions, 7 deletions
diff --git a/ext/bg/js/settings/dictionaries.js b/ext/bg/js/settings/dictionaries.js
index a7205ae5..381d1ae2 100644
--- a/ext/bg/js/settings/dictionaries.js
+++ b/ext/bg/js/settings/dictionaries.js
@@ -531,7 +531,7 @@ async function onDictionaryPurge(e) {
dictionarySpinnerShow(true);
await utilDatabasePurge();
- for (const options of toIterable(await getOptionsArray())) {
+ for (const {options} of toIterable((await apiOptionsGetFull()).profiles)) {
options.dictionaries = utilBackgroundIsolate({});
options.general.mainDictionary = '';
}
@@ -593,7 +593,7 @@ async function onDictionaryImport(e) {
}
const {result, errors} = await utilDatabaseImport(files[i], updateProgress, importDetails);
- for (const options of toIterable(await getOptionsArray())) {
+ for (const {options} of toIterable((await apiOptionsGetFull()).profiles)) {
const dictionaryOptions = SettingsDictionaryListUI.createDictionaryOptions();
dictionaryOptions.enabled = true;
options.dictionaries[result.title] = dictionaryOptions;
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 0fd9cb23..c5298dd4 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -16,11 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-async function getOptionsArray() {
- const optionsFull = await apiOptionsGetFull();
- return optionsFull.profiles.map((profile) => profile.options);
-}
-
async function formRead(options) {
options.general.enable = $('#enable').prop('checked');
options.general.showGuide = $('#show-usage-guide').prop('checked');