commit: 0bf2b372d01829863a523f8927de7a306fcc613d
parent: 585bb5727a47ccea1257cb41ca5234342d630bcb
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Fri, 5 Jun 2020 12:03:46 +0000
Merge branch '790-unable-to-filter' into 'develop'
Settings: Keep a local version of the mutedWordsString
Closes #790
See merge request pleroma/pleroma-fe!1130
Diffstat:
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
@@ -30,7 +30,8 @@ const settings = {
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
backendVersion: instance.backendVersion,
- frontendVersion: instance.frontendVersion
+ frontendVersion: instance.frontendVersion,
+ muteWordsStringLocal: this.$store.getters.mergedConfig.muteWords.join('\n')
}
},
components: {
@@ -86,8 +87,11 @@ const settings = {
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
// Special cases (need to transform values or perform actions first)
muteWordsString: {
- get () { return this.$store.getters.mergedConfig.muteWords.join('\n') },
+ get () {
+ return this.muteWordsStringLocal
+ },
set (value) {
+ this.muteWordsStringLocal = value
this.$store.dispatch('setOption', {
name: 'muteWords',
value: filter(value.split('\n'), (word) => trim(word).length > 0)