pleroma-fe

commit: 32d1a0e1813e706a298871361123636187cde9bc
parent e95412a03cb84d4d835047d44e55a2900cdfb0d1
Author: Henry Jameson <me@hjkos.com>
Date:   Mon, 31 May 2021 14:22:08 +0300

better approach

Diffstat:
M
src/components/settings_modal/helpers/boolean_setting.js
9
+++++++--
M
src/components/settings_modal/helpers/choice_setting.js
9
+++++++--

2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
@@ -16,13 +16,18 @@ export default {
       return [firstSegment + 'DefaultValue', ...rest].join('.')
     },
     state () {
-      return get(this.$parent, this.path)
+      const value = get(this.$parent, this.path)
+      if (value === undefined) {
+        return this.defaultState
+      } else {
+        return value
+      }
     },
     defaultState () {
       return get(this.$parent, this.pathDefault)
     },
     isChanged () {
-      return this.state !== undefined && this.state !== this.defaultState
+      return this.state !== this.defaultState
     }
   },
   methods: {
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
@@ -17,13 +17,18 @@ export default {
       return [firstSegment + 'DefaultValue', ...rest].join('.')
     },
     state () {
-      return get(this.$parent, this.path) || get(this.$parent, this.pathDefault)
+      const value = get(this.$parent, this.path)
+      if (value === undefined) {
+        return this.defaultState
+      } else {
+        return value
+      }
     },
     defaultState () {
       return get(this.$parent, this.pathDefault)
     },
     isChanged () {
-      return this.state !== undefined && this.state !== this.defaultState
+      return this.state !== this.defaultState
     }
   },
   methods: {