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

Fix displyname and webcam modal not appearing

Browse Source 
They are now merged into the connecting modal
same for no webrtc support
master
Daniel Berteaud 10 years ago
parent 0ef7cecb76
commit e1a9d97dd9
2 changed files with 91 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      public/js/vroom.js
  2. 177
      templates/default/join.html.ep

10
public/js/vroom.js
Unescape View File

@ -636,7 +636,8 @@ function initVroom(room) {
// If browser doesn't support webRTC or dataChannels // If browser doesn't support webRTC or dataChannels
if (!webrtc.capabilities.support || !webrtc.capabilities.supportGetUserMedia || !webrtc.capabilities.supportDataChannel){ if (!webrtc.capabilities.support || !webrtc.capabilities.supportGetUserMedia || !webrtc.capabilities.supportDataChannel){
$('#noWebrtcSupport').modal('show'); $('.connecting-msg').not('.connecting-msg').remove();
$('#no-webrtc-msg').slideDown();
} }
// Hide screen sharing btn if not supported, disable it on mobile // Hide screen sharing btn if not supported, disable it on mobile
@ -1505,7 +1506,7 @@ function initVroom(room) {
peers.local.id = webrtc.connection.socket.sessionid; peers.local.id = webrtc.connection.socket.sessionid;
getRoomInfo(); getRoomInfo();
if (roomInfo.ask_for_name && roomInfo.ask_for_name == 'yes'){ if (roomInfo.ask_for_name && roomInfo.ask_for_name == 'yes'){
$('#setDisplayName').modal('show'); $('#display-name-pre').slideDown();
} }
else{ else{
webrtc.joinRoom(room); webrtc.joinRoom(room);
@ -1568,7 +1569,7 @@ function initVroom(room) {
// error opening the webcam or mic stream // error opening the webcam or mic stream
webrtc.on('localMediaError', function(){ webrtc.on('localMediaError', function(){
$('#noWebcam').modal('show'); $('#no-webcam-msg').slideDown();
}); });
// Handle video stream removed: someone leaved the room // Handle video stream removed: someone leaved the room
@ -1720,7 +1721,8 @@ function initVroom(room) {
event.preventDefault(); event.preventDefault();
var name = $('#displayNamePre').val(); var name = $('#displayNamePre').val();
if (name.length > 0 && name.length < 50){ if (name.length > 0 && name.length < 50){
$('#setDisplayName').modal('hide'); //$('#setDisplayName').modal('hide');
$('#display-name-pre').slideUp();
$('#displayName').val(name); $('#displayName').val(name);
peers.local.hasName = true; peers.local.hasName = true;
peers.local.displayName = name; peers.local.displayName = name;

177
templates/default/join.html.ep
Unescape View File

@ -111,42 +111,6 @@
</div> </div>
</div> </div>
</nav> </nav>
<div class="modal fade" role="dialog" id="setDisplayName" aria-labelledby="setDisplayName" aria-hidden="true" data-keyboard="false" data-backdrop="static">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="setDisplayNameTitle">
<%=l 'DISPLAY_NAME_REQUIRED' %>
</h4>
</div>
<div class="modal-body">
<form role="form" class="form-horizontal" id="displayNamePreForm">
<p class="text-center">
<%=l 'SET_A_DISPLAY_NAME' %>
</p>
<div class="form-group">
<label for="displayNamePre" class="col-sm-4 control-label">
<%=l 'DISPLAY_NAME' %>
</label>
<div class="col-sm-8">
<input type="text" class="form-control" autocomplete="off" id="displayNamePre" name="displayNamePre" placeholder="<%=l 'YOUR_NAME' %>">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-8">
<button id="displayNamePreButton" class="btn btn-primary disabled" type="submit">
<%=l 'SUBMIT' %>
</button>
<a class="btn btn-default" href="<%= $self->get_url('/') %>">
<%=l 'CANCEL' %>
</a>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<div class="modal fade" role="dialog" id="wipeModal" aria-labelledby="wipeModal" aria-hidden="true"> <div class="modal fade" role="dialog" id="wipeModal" aria-labelledby="wipeModal" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
@ -295,69 +259,44 @@
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" id="noWebrtcSupport" aria-labelledby="noWebrtcSupport" aria-hidden="true"> <div class="modal fade" role="dialog" id="disconnected" aria-labelledby="disconnected" aria-hidden="true">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times; &times;
</button> </button>
<h4 class="modal-title" id="noWebrtcSupportTitle"> <h4 class="modal-title">
<%=l 'BROWSER_NOT_SUPPORTED' %> <%=l 'CONNECTION_LOST' %>
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p> <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/flash.png" alt="<%=l 'CONNECTION_LOST' %>"/>
<%=l 'NO_WEBRTC_SUPPORT' %> <br>
</p> <p class="text-center">
<% if ($ua !~ m/iphone|ipad|ipod/i){ %> <%=l 'CHECK_INTERNET_ACCESS' %>
<p>
<%=l 'DOWNLOAD_ONE_OF_THESE_BROWSERS' %>
</p> </p>
<div class="row">
<%
my $ffurl = "http://www.mozilla.org/firefox/";
my $churl = "http://www.google.com/chrome/";
my $opurl = "http://www.opera.com";
if ($ua =~ m/android/i){
$ffurl = "https://play.google.com/store/apps/details?id=org.mozilla.firefox";
$churl = "https://play.google.com/store/apps/details?id=com.android.chrome";
$opurl = "https://play.google.com/store/apps/details?id=com.opera.browser";
}
%>
<div class="col-xs-4">
<a href="<%= $ffurl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/firefox.png" alt="Mozilla Firefox"/>
</a>
</div>
<div class="col-xs-4">
<a href="<%= $churl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/chrome.png" alt="Google Chrome"/>
</a>
</div>
<div class="col-xs-4">
<a href="<%= $opurl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/opera.png" alt="Opera"/>
</a>
</div>
</div>
<% } %>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" id="noWebcam" aria-labelledby="noWebcam" aria-hidden="true"> <div class="modal fade" role="dialog" id="connecting" aria-labelledby="connecting" aria-hidden="false" data-keyboard="false" data-backdrop="static">
<div class="modal-dialog modal-lg"> <div class="modal-dialog modal-lg">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"> <h4 class="modal-title">
&times; <%=l 'CONNECTING' %>
</button>
<h4 class="modal-title" id="noWebcamTitle">
<%=l 'NO_WEBCAM' %>
</h4> </h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div id="connecting-msg" class="connecting-msg">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/connecting.gif" alt="<%=l 'CONNECTING' %>"/>
<br>
<p class="text-center">
<%=l 'CONNECTING_PLEASE_WAIT' %>
</p>
</div>
<div id="no-webcam-msg" class="connecting-msg" style="display: none">
<p class="text-center"> <p class="text-center">
<%=l 'CANT_ACCESS_WEBCAM' %> <%=l 'CANT_ACCESS_WEBCAM' %>
</p> </p>
@ -373,44 +312,68 @@
</a> </a>
</p> </p>
</div> </div>
<div id="display-name-pre" class="connecting-msg" style="display: none">
<form role="form" class="form-horizontal" id="displayNamePreForm">
<p class="text-center">
<%=l 'SET_A_DISPLAY_NAME' %>
</p>
<div class="form-group">
<label for="displayNamePre" class="col-sm-4 control-label">
<%=l 'DISPLAY_NAME' %>
</label>
<div class="col-sm-4">
<input type="text" class="form-control" autocomplete="off" id="displayNamePre" placeholder="<%=l 'YOUR_NAME' %>">
</div> </div>
</div> </div>
</div> <div class="form-group">
<div class="modal fade" role="dialog" id="disconnected" aria-labelledby="disconnected" aria-hidden="true"> <div class="col-sm-offset-4 col-sm-8">
<div class="modal-dialog modal-lg"> <button id="displayNamePreButton" class="btn btn-primary disabled" type="submit">
<div class="modal-content"> <%=l 'SUBMIT' %>
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button> </button>
<h4 class="modal-title"> <a class="btn btn-default" href="<%= $self->get_url('/') %>">
<%=l 'CONNECTION_LOST' %> <%=l 'CANCEL' %>
</h4> </a>
</div> </div>
<div class="modal-body"> </div>
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/flash.png" alt="<%=l 'CONNECTION_LOST' %>"/> </form>
<br> </div>
<p class="text-center"> <div id="no-webrtc-msg" class="connecting-msg" style="display: none">
<%=l 'CHECK_INTERNET_ACCESS' %> <p>
<%=l 'NO_WEBRTC_SUPPORT' %>
</p>
<% if ($ua !~ m/iphone|ipad|ipod/i){ %>
<p>
<%=l 'DOWNLOAD_ONE_OF_THESE_BROWSERS' %>
</p> </p>
<div class="row">
<%
my $ffurl = "http://www.mozilla.org/firefox/";
my $churl = "http://www.google.com/chrome/";
my $opurl = "http://www.opera.com";
if ($ua =~ m/android/i){
$ffurl = "https://play.google.com/store/apps/details?id=org.mozilla.firefox";
$churl = "https://play.google.com/store/apps/details?id=com.android.chrome";
$opurl = "https://play.google.com/store/apps/details?id=com.opera.browser";
}
%>
<div class="col-xs-4">
<a href="<%= $ffurl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/firefox.png" alt="Mozilla Firefox"/>
</a>
</div> </div>
<div class="col-xs-4">
<a href="<%= $churl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/chrome.png" alt="Google Chrome"/>
</a>
</div> </div>
<div class="col-xs-4">
<a href="<%= $opurl %>" target="_blank">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/opera.png" alt="Opera"/>
</a>
</div> </div>
</div> </div>
<div class="modal fade" role="dialog" id="connecting" aria-labelledby="connecting" aria-hidden="false" data-keyboard="false" data-backdrop="static"> <% } %>
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">
<%=l 'CONNECTING' %>
</h4>
</div> </div>
<div class="modal-body">
<img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/connecting.gif" alt="<%=l 'CONNECTING' %>"/>
<br>
<p class="text-center">
<%=l 'CONNECTING_PLEASE_WAIT' %>
</p>
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save