thomate/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-settings-anon' into 'develop'

Browse source 
Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
This commit is contained in:
Shpuld Shpludson 2021-07-19 16:11:11 +00:00
commit 373b14e1e4
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/settings_modal/helpers/boolean_setting.js
View file

@ -16,10 +16,18 @@ export default {
return [firstSegment + 'DefaultValue', ...rest].join('.') return [firstSegment + 'DefaultValue', ...rest].join('.')
}, },
state () { 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 () { isChanged () {
return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault) return this.state !== this.defaultState
} }
}, },
methods: { methods: {

9
src/components/settings_modal/helpers/choice_setting.js
View file

@ -17,13 +17,18 @@ export default {
return [firstSegment + 'DefaultValue', ...rest].join('.') return [firstSegment + 'DefaultValue', ...rest].join('.')
}, },
state () { state () {
return get(this.$parent, this.path) const value = get(this.$parent, this.path)
if (value === undefined) {
return this.defaultState
} else {
return value
}
}, },
defaultState () { defaultState () {
return get(this.$parent, this.pathDefault) return get(this.$parent, this.pathDefault)
}, },
isChanged () { isChanged () {
return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault) return this.state !== this.defaultState
} }
}, },
methods: { methods: {