paoda
/
polyglot
mirror of https://github.com/beatriceo/polyglot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into hangup

This commit is contained in:
Beatrice Olivera 2018-09-04 14:53:57 +01:00 committed by GitHub
parent 95d0c2f5cd a42f72974a
commit 73283b1fa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/packs/chatrooms.js
View File

@ -40,13 +40,13 @@ hangUpIcon.addEventListener('click', event => {
}) })
// Testing ActionCable // Testing ActionCable
// const testBtn = document.getElementById('test-btn') const testBtn = document.getElementById('test-btn')
// testBtn.addEventListener('click', event => { testBtn.addEventListener('click', event => {
// fetch(`/chat_rooms/${chatroomId}/cable_testing` , { fetch(`/chat_rooms/${chatroomId}/cable_testing` , {
// method: 'POST', method: 'POST',
// body: JSON.stringify({}) body: JSON.stringify({})
// }) })
// }) })

1
app/views/chat_rooms/show.html.erb
View File

@ -1,3 +1,4 @@
<button id="test-btn" class="btn btn-primary">Test Connection</button>
<div id="join-btn" data-room="<%= @chat_room.id %>"></div> <div id="join-btn" data-room="<%= @chat_room.id %>"></div>
<div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div> <div id="chatroom-hook" data-chatroom-id='<%= @chat_room.id %>'></div>