commit: e95412a03cb84d4d835047d44e55a2900cdfb0d1
parent 4e96af044224dc10b8cc4eb270e025f1b8a1d29a
Author: Henry Jameson <me@hjkos.com>
Date: Mon, 31 May 2021 14:16:37 +0300
fix BooleanSetting and ChoiceSetting not working properly on initial
launch as anon visitor (would show all as changed, empty selects)
Diffstat:
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
@@ -18,8 +18,11 @@ export default {
state () {
return get(this.$parent, this.path)
},
+ defaultState () {
+ return get(this.$parent, this.pathDefault)
+ },
isChanged () {
- return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+ return this.state !== undefined && 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,13 @@ export default {
return [firstSegment + 'DefaultValue', ...rest].join('.')
},
state () {
- return get(this.$parent, this.path)
+ return get(this.$parent, this.path) || get(this.$parent, this.pathDefault)
},
defaultState () {
return get(this.$parent, this.pathDefault)
},
isChanged () {
- return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+ return this.state !== undefined && this.state !== this.defaultState
}
},
methods: {