moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Show chat only if channel is joined.

See merge request pleroma/pleroma-fe!197
This commit is contained in:
lambda 2018-02-02 07:31:17 +00:00
parent 97854eec58 043e14d5cb
commit 8010c42768
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.js
View File

@ -24,7 +24,7 @@ export default {
logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } }, logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } },
style () { return { 'background-image': `url(${this.background})` } }, style () { return { 'background-image': `url(${this.background})` } },
sitename () { return this.$store.state.config.name }, sitename () { return this.$store.state.config.name },
chat () { return this.$store.state.chat.channel } chat () { return this.$store.state.chat.channel.state === 'joined' }
}, },
methods: { methods: {
activatePanel (panelName) { activatePanel (panelName) {

2
src/modules/chat.js
View File

@ -1,7 +1,7 @@
const chat = { const chat = {
state: { state: {
messages: [], messages: [],
channel: null channel: {state: ''}
}, },
mutations: { mutations: {
setChannel (state, channel) { setChannel (state, channel) {