paoda/polyglot
1
0
Fork 0
mirror of https://github.com/beatriceo/polyglot.git synced 2025-10-25 18:52:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into del

Browse Source
This commit is contained in:
Beatrice Olivera
2018-08-31 15:09:04 +01:00
committed by GitHub
parent c67849c3dc 2d20473270
commit d27a53feea
10 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

22
app/assets/javascripts/signaling-server.js
View File

@@ -16,10 +16,12 @@ let pcPeers = {}; // peer connection
let localstream;
window.onload = () => {
currentUser = document.getElementById("current-user").innerHTML;
console.log(currentUser)
localVideo = document.getElementById("local-video");
remoteVideoContainer = document.getElementById("remote-video-container");
// if (document.getElementById("current-user")) {
currentUser = document.getElementById("current-user").innerHTML;
console.log(currentUser)
localVideo = document.getElementById("local-video");
remoteVideoContainer = document.getElementById("remote-video-container");
// }
};
// Ice Credentials
@@ -35,8 +37,10 @@ document.onreadystatechange = async () => {
})
localstream = stream;
localVideo.srcObject = stream
localVideo.muted = true
// if (localVideo) {
localVideo.srcObject = stream
localVideo.muted = true
// }
} catch (e) { console.error(e); }
}
};
@@ -67,7 +71,11 @@ document.onreadystatechange = async () => {
// }
// });
// };
const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
// if (document.getElementById('chatroom-hook')) {
const chatroomId = document.getElementById('chatroom-hook').dataset["chatroomId"]
// }
const handleJoinSession = async () => {
App['chatroom' + chatroomId] = await App.cable.subscriptions.create({

28
app/assets/stylesheets/pages/_contacts.scss
View File

@@ -131,3 +131,31 @@ a:hover {
justify-content: center;
align-items: center;
}
.contact {
color: white;
}
.contacts {
height: 570px;
overflow: scroll;
}