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

Merge pull request #76 from beatriceo/scroll 

done with scroll to bottom
This commit is contained in:
Ethan1710 2018-09-06 16:14:23 +01:00 committed by GitHub
parent c4c1ea7b49 ef53f19617
commit 5b684718c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
// Add message to container
messagesContainer.appendChild(messageDiv)
messagesContainer.scrollTop = div.scrollHeight
} else if (data["chat_message"] && data["chat_message"]["userId"] != userId) {
// const callerName = document.getElementById('caller-name')
@ -75,6 +76,8 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
}),
headers: { "content-type": "application/json", "X-CSRF-Token": document.querySelector('meta[name=csrf-token]').content }
})
const messagesContainer = document.getElementById('messages-container')
messagesContainer.scrollTop = div.scrollHeight
} else if (data["translated_message"] && data["userId"] == userId) {
const messagesContainer = document.getElementById('messages-container')
@ -105,8 +108,11 @@ App['chatroom' + chatroomId] = App.cable.subscriptions.create({
})
messagesContainer.appendChild(messageDiv)
messagesContainer.scrollTop = div.scrollHeight
} else {
// console.log(data)
const messagesContainer = document.getElementById('messages-container')
messagesContainer.scrollTop = div.scrollHeight
}
if (data.hangUp) {
document.location.pathname = '/contacts'

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

@ -60,6 +60,11 @@
<div><span id="current-user" class="text-color" style="display:none"><%= current_user.id %></span></div>
<script>
const div = document.getElementById('messages-container')
div.scrollTop = div.scrollHeight
</script>
<%= javascript_pack_tag 'chatrooms' %>
<%= javascript_pack_tag 'webrtc' %>
<%= javascript_pack_tag 'translate' %>