aboutsummaryrefslogtreecommitdiff
path: root/src/App.js
diff options
context:
space:
mode:
authorHakaba Hitoyo <example@example.com>2018-02-04 08:36:10 +0900
committerHakaba Hitoyo <example@example.com>2018-02-04 08:36:10 +0900
commit013f11497fbc955bea6c182d64b512de2ee3bcdf (patch)
tree6979bab5ddc02f68992cf8e71b4612e3f2b02d12 /src/App.js
parent95cba854f389ebdee200d0df147e4c26ed4949a0 (diff)
parentd97e6777ba849c9802da1e566d2baa2e1d7bdf70 (diff)
slove-conflict
Diffstat (limited to 'src/App.js')
-rw-r--r--src/App.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.js b/src/App.js
index 1c6f4fcc..4eabba8b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -26,7 +26,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' },
showInstanceSpecificPanel () { return this.$store.state.config.showInstanceSpecificPanel}
},
methods: {