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

Merge pull request #29 from beatriceo/signaling-fix 

Fixed serious bug in signaling-js
This commit is contained in:
Beatrice Olivera 2018-08-31 14:26:53 +01:00 committed by GitHub
parent 5b87fd5e01 4b7dee3633
commit 2d20473270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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