Change how formRead works

The function now modifies values in-place.

1 files changed, 68 insertions, 67 deletions

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 83f4528c..a59f7c0d 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -17,72 +17,68 @@
  */
 
 
-async function formRead() {
-    const optionsOld = await optionsLoad();
-    const optionsNew = $.extend(true, {}, optionsOld);
-
-    optionsNew.general.showGuide = $('#show-usage-guide').prop('checked');
-    optionsNew.general.compactTags = $('#compact-tags').prop('checked');
-    optionsNew.general.compactGlossaries = $('#compact-glossaries').prop('checked');
-    optionsNew.general.autoPlayAudio = $('#auto-play-audio').prop('checked');
-    optionsNew.general.resultOutputMode = $('#result-output-mode').val();
-    optionsNew.general.audioSource = $('#audio-playback-source').val();
-    optionsNew.general.audioVolume = parseFloat($('#audio-playback-volume').val());
-    optionsNew.general.debugInfo = $('#show-debug-info').prop('checked');
-    optionsNew.general.showAdvanced = $('#show-advanced-options').prop('checked');
-    optionsNew.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
-    optionsNew.general.popupDisplayMode = $('#popup-display-mode').val();
-    optionsNew.general.popupHorizontalTextPosition = $('#popup-horizontal-text-position').val();
-    optionsNew.general.popupVerticalTextPosition = $('#popup-vertical-text-position').val();
-    optionsNew.general.popupWidth = parseInt($('#popup-width').val(), 10);
-    optionsNew.general.popupHeight = parseInt($('#popup-height').val(), 10);
-    optionsNew.general.popupHorizontalOffset = parseInt($('#popup-horizontal-offset').val(), 0);
-    optionsNew.general.popupVerticalOffset = parseInt($('#popup-vertical-offset').val(), 10);
-    optionsNew.general.popupHorizontalOffset2 = parseInt($('#popup-horizontal-offset2').val(), 0);
-    optionsNew.general.popupVerticalOffset2 = parseInt($('#popup-vertical-offset2').val(), 10);
-    optionsNew.general.customPopupCss = $('#custom-popup-css').val();
-
-    optionsNew.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
-    optionsNew.scanning.touchInputEnabled = $('#touch-input-enabled').prop('checked');
-    optionsNew.scanning.selectText = $('#select-matched-text').prop('checked');
-    optionsNew.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
-    optionsNew.scanning.autoHideResults = $('#auto-hide-results').prop('checked');
-    optionsNew.scanning.deepDomScan = $('#deep-dom-scan').prop('checked');
-    optionsNew.scanning.enableOnPopupExpressions = $('#enable-scanning-of-popup-expressions').prop('checked');
-    optionsNew.scanning.enableOnSearchPage = $('#enable-scanning-on-search-page').prop('checked');
-    optionsNew.scanning.delay = parseInt($('#scan-delay').val(), 10);
-    optionsNew.scanning.length = parseInt($('#scan-length').val(), 10);
-    optionsNew.scanning.modifier = $('#scan-modifier-key').val();
-    optionsNew.scanning.popupNestingMaxDepth = parseInt($('#popup-nesting-max-depth').val(), 10);
-
-    optionsNew.anki.enable = $('#anki-enable').prop('checked');
-    optionsNew.anki.tags = $('#card-tags').val().split(/[,; ]+/);
-    optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
-    optionsNew.anki.server = $('#interface-server').val();
-    optionsNew.anki.screenshot.format = $('#screenshot-format').val();
-    optionsNew.anki.screenshot.quality = parseInt($('#screenshot-quality').val(), 10);
-    optionsNew.anki.fieldTemplates = $('#field-templates').val();
-
-    if (optionsOld.anki.enable && !ankiErrorShown()) {
-        optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
-        optionsNew.anki.terms.model = $('#anki-terms-model').val();
-        optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
-        optionsNew.anki.kanji.deck = $('#anki-kanji-deck').val();
-        optionsNew.anki.kanji.model = $('#anki-kanji-model').val();
-        optionsNew.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
+async function formRead(options) {
+    options.general.showGuide = $('#show-usage-guide').prop('checked');
+    options.general.compactTags = $('#compact-tags').prop('checked');
+    options.general.compactGlossaries = $('#compact-glossaries').prop('checked');
+    options.general.autoPlayAudio = $('#auto-play-audio').prop('checked');
+    options.general.resultOutputMode = $('#result-output-mode').val();
+    options.general.audioSource = $('#audio-playback-source').val();
+    options.general.audioVolume = parseFloat($('#audio-playback-volume').val());
+    options.general.debugInfo = $('#show-debug-info').prop('checked');
+    options.general.showAdvanced = $('#show-advanced-options').prop('checked');
+    options.general.maxResults = parseInt($('#max-displayed-results').val(), 10);
+    options.general.popupDisplayMode = $('#popup-display-mode').val();
+    options.general.popupHorizontalTextPosition = $('#popup-horizontal-text-position').val();
+    options.general.popupVerticalTextPosition = $('#popup-vertical-text-position').val();
+    options.general.popupWidth = parseInt($('#popup-width').val(), 10);
+    options.general.popupHeight = parseInt($('#popup-height').val(), 10);
+    options.general.popupHorizontalOffset = parseInt($('#popup-horizontal-offset').val(), 0);
+    options.general.popupVerticalOffset = parseInt($('#popup-vertical-offset').val(), 10);
+    options.general.popupHorizontalOffset2 = parseInt($('#popup-horizontal-offset2').val(), 0);
+    options.general.popupVerticalOffset2 = parseInt($('#popup-vertical-offset2').val(), 10);
+    options.general.customPopupCss = $('#custom-popup-css').val();
+
+    options.scanning.middleMouse = $('#middle-mouse-button-scan').prop('checked');
+    options.scanning.touchInputEnabled = $('#touch-input-enabled').prop('checked');
+    options.scanning.selectText = $('#select-matched-text').prop('checked');
+    options.scanning.alphanumeric = $('#search-alphanumeric').prop('checked');
+    options.scanning.autoHideResults = $('#auto-hide-results').prop('checked');
+    options.scanning.deepDomScan = $('#deep-dom-scan').prop('checked');
+    options.scanning.enableOnPopupExpressions = $('#enable-scanning-of-popup-expressions').prop('checked');
+    options.scanning.enableOnSearchPage = $('#enable-scanning-on-search-page').prop('checked');
+    options.scanning.delay = parseInt($('#scan-delay').val(), 10);
+    options.scanning.length = parseInt($('#scan-length').val(), 10);
+    options.scanning.modifier = $('#scan-modifier-key').val();
+    options.scanning.popupNestingMaxDepth = parseInt($('#popup-nesting-max-depth').val(), 10);
+
+    const optionsAnkiEnableOld = options.anki.enable;
+    options.anki.enable = $('#anki-enable').prop('checked');
+    options.anki.tags = $('#card-tags').val().split(/[,; ]+/);
+    options.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
+    options.anki.server = $('#interface-server').val();
+    options.anki.screenshot.format = $('#screenshot-format').val();
+    options.anki.screenshot.quality = parseInt($('#screenshot-quality').val(), 10);
+    options.anki.fieldTemplates = $('#field-templates').val();
+
+    if (optionsAnkiEnableOld && !ankiErrorShown()) {
+        options.anki.terms.deck = $('#anki-terms-deck').val();
+        options.anki.terms.model = $('#anki-terms-model').val();
+        options.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
+        options.anki.kanji.deck = $('#anki-kanji-deck').val();
+        options.anki.kanji.model = $('#anki-kanji-model').val();
+        options.anki.kanji.fields = ankiFieldsToDict($('#kanji .anki-field-value'));
     }
 
-    optionsNew.general.mainDictionary = $('#dict-main').val();
+    options.general.mainDictionary = $('#dict-main').val();
     $('.dict-group').each((index, element) => {
         const dictionary = $(element);
-        optionsNew.dictionaries[dictionary.data('title')] = {
+        options.dictionaries[dictionary.data('title')] = {
             priority: parseInt(dictionary.find('.dict-priority').val(), 10),
             enabled: dictionary.find('.dict-enabled').prop('checked'),
             allowSecondarySearches: dictionary.find('.dict-allow-secondary-searches').prop('checked')
         };
     });
-
-    return {optionsNew, optionsOld};
 }
 
 function formUpdateVisibility(options) {
@@ -141,18 +137,22 @@ async function onFormOptionsChanged(e) {
         return;
     }
 
-    const {optionsNew, optionsOld} = await formRead();
-    await optionsSave(optionsNew);
-    formUpdateVisibility(optionsNew);
+    const options = await optionsLoad();
+    const optionsAnkiEnableOld = options.anki.enable;
+    const optionsAnkiServerOld = options.anki.server;
+
+    await formRead(options);
+    await optionsSave(options);
+    formUpdateVisibility(options);
 
     try {
         const ankiUpdated =
-            optionsNew.anki.enable !== optionsOld.anki.enable ||
-            optionsNew.anki.server !== optionsOld.anki.server;
+            options.anki.enable !== optionsAnkiEnableOld ||
+            options.anki.server !== optionsAnkiServerOld;
 
         if (ankiUpdated) {
             ankiSpinnerShow(true);
-            await ankiDeckAndModelPopulate(optionsNew);
+            await ankiDeckAndModelPopulate(options);
             ankiErrorShow();
         }
     } catch (e) {
@@ -566,12 +566,13 @@ async function onAnkiModelChanged(e) {
         const tab = element.closest('.tab-pane');
         const tabId = tab.attr('id');
 
-        const {optionsNew, optionsOld} = await formRead();
-        optionsNew.anki[tabId].fields = {};
-        await optionsSave(optionsNew);
+        const options = await optionsLoad();
+        await formRead(options);
+        options.anki[tabId].fields = {};
+        await optionsSave(options);
 
         ankiSpinnerShow(true);
-        await ankiFieldsPopulate(element, optionsNew);
+        await ankiFieldsPopulate(element, options);
         ankiErrorShow();
     } catch (e) {
         ankiErrorShow(e);