diff options
| author | scarlett <nia@netbsd.org> | 2018-10-21 18:04:23 +0100 |
|---|---|---|
| committer | scarlett <nia@netbsd.org> | 2018-10-21 18:04:23 +0100 |
| commit | d6ad08050ad0cfcf5ed4a94b5b2e8c66ef27ca0a (patch) | |
| tree | 0c815bd9262f9f28cdd66a1c8b53b83bf8e252db /src | |
| parent | 82cc37a55eaf32e88748133c77901905e29172f8 (diff) | |
Fall back to instance settings consistently
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/status/status.js | 15 | ||||
| -rw-r--r-- | src/modules/config.js | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 45f5ccac..f1afcac7 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -31,10 +31,17 @@ const Status = { preview: null, showPreview: false, showingTall: false, - expandingSubject: !this.$store.state.config.collapseMessageWithSubject + expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined' + ? !this.$store.state.instance.collapseMessageWithSubject + : !this.$store.state.config.collapseMessageWithSubject } }, computed: { + localCollapseSubjectDefault () { + return typeof this.$store.state.config.collapseMessageWithSubject === 'undefined' + ? this.$store.state.instance.collapseMessageWithSubject + : this.$store.state.config.collapseMessageWithSubject + }, muteWords () { return this.$store.state.config.muteWords }, @@ -147,13 +154,13 @@ const Status = { return this.status.attentions.length > 0 }, hideSubjectStatus () { - if (this.tallStatus && !this.$store.state.config.collapseMessageWithSubject) { + if (this.tallStatus && !this.localCollapseSubjectDefault) { return false } return !this.expandingSubject && this.status.summary }, hideTallStatus () { - if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) { + if (this.status.summary && this.localCollapseSubjectDefault) { return false } if (this.showingTall) { @@ -168,7 +175,7 @@ const Status = { if (!this.status.nsfw) { return false } - if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) { + if (this.status.summary && this.localCollapseSubjectDefault) { return false } return true diff --git a/src/modules/config.js b/src/modules/config.js index 375d0167..1c04845a 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -5,7 +5,6 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] const defaultState = { colors: {}, - collapseMessageWithSubject: false, hideAttachments: false, hideAttachmentsInConv: false, hideNsfw: true, |