diff options
| -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 | 3 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 | ||||
| -rw-r--r-- | static/config.json | 3 |
6 files changed, 7 insertions, 5 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 5693dcc6..2e7754ab 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => { copyInstanceOption('subjectLineBehavior') 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 526a7021..c9528f6f 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,8 +30,7 @@ const defaultState = { interfaceLanguage: browserLocale, scopeCopy: undefined, // instance default subjectLineBehavior: undefined, // instance default - alwaysShowSubjectInput: undefined, // instance default - showFeaturesPanel: true + alwaysShowSubjectInput: undefined // instance default } const config = { diff --git a/src/modules/instance.js b/src/modules/instance.js index 4ad41873..1bb5eb1b 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -28,6 +28,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, + showFeaturesPanel: false, // Nasty stuff pleromaBackend: true, diff --git a/static/config.json b/static/config.json index 24e26696..204b5fc7 100644 --- a/static/config.json +++ b/static/config.json @@ -19,5 +19,6 @@ "loginMethod": "password", "webPushNotifications": false, "noAttachmentLinks": false, - "nsfwCensorImage": "" + "nsfwCensorImage": "", + "showFeaturesPanel": true } |