aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/App.vue2
-rw-r--r--src/modules/chat.js18
2 files changed, 1 insertions, 19 deletions
diff --git a/src/App.vue b/src/App.vue
index e09ce4c8..1a166778 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
<media-modal />
</div>
<chat-panel
- v-if="currentUser"
+ v-if="currentUser && chat"
:floating="true"
class="floating-chat mobile-hidden"
/>
diff --git a/src/modules/chat.js b/src/modules/chat.js
index 264ba00b..ffeb272b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,24 +18,6 @@ const chat = {
actions: {
initializeChat (store, socket) {
const channel = socket.channel('chat:public')
- let id = 0
- const createmsg = () => {
- id += 1
- return {
- text: 'test' + id,
- author: {
- username: 'test',
- avatar: '',
- id
- }
- }
- }
-
- const loop = () => {
- store.commit('addMessage', createmsg())
- setTimeout(loop, 3000)
- }
- loop()
channel.on('new_msg', (msg) => {
store.commit('addMessage', msg)