Changeset 35950

Timestamp:

2022-01-11T10:48:54+13:00 (2 years ago)

Author:

cstephen

Message:

Fix localStorage-backed properties

File:

• main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/DirectInput.vue (modified) (3 diffs)

main/trunk/model-interfaces-dev/atea/macron-restoration/src/components/DirectInput.vue

@@ -14 +14 @@
             macroniseWaitTimeout: null,
             waitingToMacronise: false,
-            errorState: false
+            errorState: false,
+            preserveExistingMacrons: true,
+            enableSpellcheck: false,
+            showMacronisedWords: true,
+            normaliseLinebreaks: false
         }
     },
     computed: {
-        preserveExistingMacrons: {
-            get() {
-                const value = localStorage.getItem("preserveExistingMacrons");
-                return value ?? true;
-            },
-            set(newValue) {
-                localStorage.setItem("preserveExistingMacrons", newValue);
-            }
-        },
-        enableSpellcheck: {
-            get() {
-                return localStorage.getItem("enableSpellcheck");
-            },
-            set(newValue) {
-                localStorage.setItem("enableSpellcheck", newValue);
-            }
-        },
-        showMacronisedWords: {
-            get() {
-                const value = localStorage.getItem("showMacronisedWords");
-                return value ?? true;
-            },
-            set(newValue) {
-                localStorage.setItem("showMacronisedWords", newValue);
-            }
-        },
-        normaliseLinebreaks: {
-            get() {
-                return localStorage.getItem("normaliseLinebreaks");
-            },
-            set(newValue) {
-                localStorage.setItem("normaliseLinebreaks", newValue);
-            }
-        },
         canDownload() {
             return this.restored.length > 0 && !this.waitingToMacronise;
@@ -118 +88 @@
             translations: state => state.translations
         })
+    },
+    watch: {
+        preserveExistingMacrons(newValue) {
+            localStorage.setItem("preserveExistingMacrons", newValue);
+        },
+        enableSpellcheck(newValue) {
+            localStorage.setItem("enableSpellcheck", newValue);
+        },
+        showMacronisedWords(newValue) {
+            localStorage.setItem("showMacronisedWords", newValue);
+        },
+        normaliseLinebreaks(newValue) {
+            localStorage.setItem("normaliseLinebreaks", newValue);
+        }
     },
     methods: {
@@ -184 +168 @@
             return result;
         }
+    },
+    beforeMount() {
+        // The null check is used to default this setting to true
+        this.preserveExistingMacrons = (localStorage.getItem("preserveExistingMacrons") ?? "true") === "true";
+        this.enableSpellcheck = localStorage.getItem("enableSpellcheck") === "true";
+        this.showMacronisedWords = (localStorage.getItem("showMacronisedWords") ?? "true") === "true";
+        this.normaliseLinebreaks = localStorage.getItem("normaliseLinebreaks") === "true";
     }
 }