Merge pull request #26 from beatriceo/modal-fix

fixed issue where modal trigger broke navbar
This commit is contained in:
Beatrice Olivera 2018-08-31 12:03:09 +01:00 committed by GitHub
commit b2182f0322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 18 deletions

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({

View File

@ -0,0 +1,11 @@
const triggerModalEvent = () => {
const btn = document.getElementById("modalTrigger");
const modal = document.getElementById("myModal");
btn.addEventListener('click', function(event) {
$('#myModal').modal('show');
});
}
export { triggerModalEvent }

View File

@ -1,4 +1,9 @@
import "bootstrap";
import { profilePageAnimation } from '../users/lesson';
profilePageAnimation();
import { triggerModalEvent } from "../components/modal.js";
triggerModalEvent();
// import { profilePageAnimation } from '../users/lesson';
// profilePageAnimation();

View File

@ -1,8 +0,0 @@
import "bootstrap";
const btn = document.getElementById("modalTrigger");
const modal = document.getElementById("myModal");
btn.addEventListener('click', function(event) {
$('#myModal').modal('show');
});

View File

@ -15,5 +15,6 @@
<%= yield %>
<%= javascript_include_tag 'application' %>
<%= javascript_pack_tag 'application' %>
</body>
</html>

View File

@ -61,4 +61,3 @@ end
</div>
<%= javascript_pack_tag 'modal' %>