dani/vroom
1
0
Fork 0
mirror of https://github.com/dani/vroom.git synced 2024-06-02 05:21:39 +02:00
Code Issues Projects Releases Wiki Activity

Use form instead of simple divs for paswords

Browse Source 
So hitting enter also submit it
This commit is contained in:
Daniel Berteaud 2014-05-13 21:04:45 +02:00
parent 697b143cef
commit 4fb717b6be
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/js/vroom.js
View File

@ -681,7 +681,8 @@ function initVroom(room) {
});
// Join password protection
$('#setJoinPassButton').click(function(event) {
$('#joinPassForm').submit(function(event) {
event.preventDefault();
var pass = $('#joinPass').val();
$('#joinPass').val('');
$('#setJoinPassButton').addClass('disabled');
@ -734,7 +735,7 @@ function initVroom(room) {
});
});
// Set owner password
$('#ownerPass').on('input', function() {
if ($('#ownerPass').val() == ''){
$('#setOwnerPassButton').addClass('disabled');
@ -743,9 +744,8 @@ function initVroom(room) {
$('#setOwnerPassButton').removeClass('disabled');
}
});
// Set owner password
$('#setOwnerPassButton').click(function(event) {
$('#ownerPassForm').submit(function(event) {
event.preventDefault();
var pass = $('#ownerPass').val();
$('#ownerPass').val('');
$('#setOwnerPassButton').addClass('disabled');

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

@ -87,14 +87,14 @@
</button>
<ul class="dropdown-menu" role="menu" aria-labelledby="confMenuButton" id="confMenu">
<li>
<div class="navbar-form">
<form class="navbar-form" id="joinPassForm">
<center>
<p><%=l 'YOU_CAN_PASSWORD_PROTECT_JOIN' %></p>
</center>
<div class="input-group">
<input type="password" id="joinPass" class="form-control help" placeholder="<%=l 'PASSWORD' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>"/>
<span class="input-group-btn">
<button id="setJoinPassButton" type="button" class="btn btn-default help disabled" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>">
<button id="setJoinPassButton" type="submit" class="btn btn-default help disabled" data-toggle="tooltip" data-placement="bottom" title="<%=l 'PASSWORD_PROTECT' %>">
<span class="glyphicon glyphicon-ok"
</span>
</button>
@ -104,19 +104,19 @@
</button>
</span>
</div>
</div>
</form>
</li>
<li class="divider">
</li>
<li>
<div class="navbar-form">
<form class="navbar-form" id="ownerPassForm">
<center>
<p><%=l 'OWNER_PASSWORD_MAKES_PERSISTENT' %></p>
</center>
<div class="input-group">
<input type="password" id="ownerPass" class="form-control help" placeholder="<%=l 'PASSWORD' %>" data-toggle="tooltip" data-placement="bottom" title="<%=l 'OWNER_PASSWORD' %>"/>
<span class="input-group-btn">
<button id="setOwnerPassButton" type="button" class="btn btn-default help disabled" data-toggle="tooltip" data-placement="bottom" title="<%=l 'OWNER_PASSWORD' %>">
<button id="setOwnerPassButton" type="submit" class="btn btn-default help disabled" data-toggle="tooltip" data-placement="bottom" title="<%=l 'OWNER_PASSWORD' %>">
<span class="glyphicon glyphicon-ok"
</span>
</button>
@ -126,7 +126,7 @@
</button>
</span>
</div>
</div>
</form>
</li>
</ul>
</div>