dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleaner error when neither webcam nor mic are available

This commit is contained in:
Daniel Berteaud 2015-07-21 18:43:05 +02:00
parent 409d3a6ae6
commit 96557f571a
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/js/vroom.js
View File

@ -1822,7 +1822,12 @@ function initVroom(room) {
// error opening the webcam or mic stream
webrtc.on('localMediaError', function(){
$('#no-webcam-msg').slideDown();
$('#no-media-msg').slideDown();
// If video is disabled but we still have an error
// it means mic isn't available
if (!video){
$('#connecting-msg').slideUp();
}
});
// Handle video stream removed: someone leaved the room

20
templates/default/join.html.ep
View File

@ -227,7 +227,24 @@
<p class="text-center connecting-err-reason">
</p>
</div>
<div id="no-webcam-msg" class="connecting-msg" style="display: none">
<div id="no-media-msg" class="connecting-msg" style="display: none">
<% if (defined(stash('video')) && stash('video') eq 'false'){ %>
<p class="text-center">
<%= l('NO_MEDIA_AVAILABLE') %>
</p>
<div class="row">
<div class="col-xs-6">
%= image '/img/webcam.png', alt => "Webcam", class => "img-responsive, center-block"
</div>
<div class="col-xs-6">
%= image '/img/mic.png', alt => "Microphone", class => "img-responsive, center-block"
</div>
</div>
<br>
<p class="text-center">
<%= l('YOU_NEED8MIC_OR_WEBCAM') %>
</p>
<% } else { %>
<p class="text-center">
<%= l('CANT_ACCESS_WEBCAM') %>
</p>
@ -242,6 +259,7 @@
</span>
</a>
</p>
<% } %>
</div>
<div id="auth-before-join" class="connecting-msg" style="display: none">
<form role="form" class="form-horizontal" id="authBeforeJoinForm">