diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.js | 2 | ||||
| -rw-r--r-- | src/boot/after_store.js | 1 | ||||
| -rw-r--r-- | src/components/about/about.js | 2 | ||||
| -rw-r--r-- | src/modules/config.js | 4 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 |
5 files changed, 8 insertions, 2 deletions
@@ -82,7 +82,7 @@ export default { unseenNotificationsCount () { return this.unseenNotifications.length }, - showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } + showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel } }, methods: { scrollToTop () { diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 3b08a3f6..b5da9944 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -87,6 +87,7 @@ const afterStoreSetup = ({ store, i18n }) => { copyInstanceOption('postContentType') copyInstanceOption('alwaysShowSubjectInput') copyInstanceOption('noAttachmentLinks') + copyInstanceOption('showFeaturesPanel') if ((config.chatDisabled)) { store.dispatch('disableChat') diff --git a/src/components/about/about.js b/src/components/about/about.js index b1ce3c7d..ae1cb182 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -9,7 +9,7 @@ const About = { TermsOfServicePanel }, computed: { - showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } + showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel } } } diff --git a/src/modules/config.js b/src/modules/config.js index 2a70fbe2..eb2df541 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,9 +30,13 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default +<<<<<<< HEAD + alwaysShowSubjectInput: undefined // instance default +======= alwaysShowSubjectInput: undefined, // instance default showFeaturesPanel: true, postContentType: undefined // instance default +>>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac } const config = { diff --git a/src/modules/instance.js b/src/modules/instance.js index 475da92e..46ca04d8 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -29,6 +29,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, + showFeaturesPanel: false, // Nasty stuff pleromaBackend: true, |