lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'updates' into feature-qrcode

This commit is contained in:
jfederico 2017-08-15 19:25:10 +00:00
parent ce4c9456a7 f66f3d4dab
commit 9db643a533
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/landing.js
View File

@ -25,7 +25,7 @@
var qrcode; var qrcode;
var waitForModerator = function(url) { var waitForModerator = function(url) {
Window.localStorage.setItem("waitingName", $('.meeting-user-name').val()); window.localStorage.setItem("waitingName", $('.meeting-user-name').val());
$.post(url + "/wait", {name: $('.meeting-user-name').val()}, function(html) { $.post(url + "/wait", {name: $('.meeting-user-name').val()}, function(html) {
$(".center-panel-wrapper").html(html); $(".center-panel-wrapper").html(html);
}); });
@ -41,7 +41,7 @@
Meeting.clear(); Meeting.clear();
var nameInput = $('.meeting-user-name'); var nameInput = $('.meeting-user-name');
if (!nameInput.val()) { if (!nameInput.val()) {
var lastName = Window.localStorage.getItem('lastJoinedName'); var lastName = window.localStorage.getItem('lastJoinedName');
if (lastName !== 'undefined') { if (lastName !== 'undefined') {
nameInput.val(lastName); nameInput.val(lastName);
} }