logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 8010c42768b3436df93c489ab971b2574c7a8f6b
parent: 97854eec58601c66b1fa24109f8c7324f87bc98a
Author: lambda <pleromagit@rogerbraun.net>
Date:   Fri,  2 Feb 2018 07:31:17 +0000

Merge branch 'fix/chat-visibility' into 'develop'

Show chat only if channel is joined.

See merge request pleroma/pleroma-fe!197

Diffstat:

Msrc/App.js2+-
Msrc/modules/chat.js2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js @@ -24,7 +24,7 @@ export default { logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } }, style () { return { 'background-image': `url(${this.background})` } }, sitename () { return this.$store.state.config.name }, - chat () { return this.$store.state.chat.channel } + chat () { return this.$store.state.chat.channel.state === 'joined' } }, methods: { activatePanel (panelName) { diff --git a/src/modules/chat.js b/src/modules/chat.js @@ -1,7 +1,7 @@ const chat = { state: { messages: [], - channel: null + channel: {state: ''} }, mutations: { setChannel (state, channel) {