Fix showFeaturesPanel option as instance

This commit is contained in:
jasper 2019-02-08 12:17:14 -08:00
parent 6a867f6ae3
commit 70c05a0c08
6 changed files with 7 additions and 5 deletions

View File

@ -82,7 +82,7 @@ export default {
unseenNotificationsCount () { unseenNotificationsCount () {
return this.unseenNotifications.length return this.unseenNotifications.length
}, },
showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
}, },
methods: { methods: {
scrollToTop () { scrollToTop () {

View File

@ -86,6 +86,7 @@ const afterStoreSetup = ({ store, i18n }) => {
copyInstanceOption('subjectLineBehavior') copyInstanceOption('subjectLineBehavior')
copyInstanceOption('alwaysShowSubjectInput') copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks') copyInstanceOption('noAttachmentLinks')
copyInstanceOption('showFeaturesPanel')
if ((config.chatDisabled)) { if ((config.chatDisabled)) {
store.dispatch('disableChat') store.dispatch('disableChat')

View File

@ -9,7 +9,7 @@ const About = {
TermsOfServicePanel TermsOfServicePanel
}, },
computed: { computed: {
showFeaturesPanel () { return this.$store.state.config.showFeaturesPanel } showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }
} }
} }

View File

@ -30,8 +30,7 @@ const defaultState = {
interfaceLanguage: browserLocale, interfaceLanguage: browserLocale,
scopeCopy: undefined, // instance default scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default subjectLineBehavior: undefined, // instance default
alwaysShowSubjectInput: undefined, // instance default alwaysShowSubjectInput: undefined // instance default
showFeaturesPanel: true
} }
const config = { const config = {

View File

@ -28,6 +28,7 @@ const defaultState = {
nsfwCensorImage: undefined, nsfwCensorImage: undefined,
vapidPublicKey: undefined, vapidPublicKey: undefined,
noAttachmentLinks: false, noAttachmentLinks: false,
showFeaturesPanel: false,
// Nasty stuff // Nasty stuff
pleromaBackend: true, pleromaBackend: true,

View File

@ -19,5 +19,6 @@
"loginMethod": "password", "loginMethod": "password",
"webPushNotifications": false, "webPushNotifications": false,
"noAttachmentLinks": false, "noAttachmentLinks": false,
"nsfwCensorImage": "" "nsfwCensorImage": "",
"showFeaturesPanel": true
} }