Skip to content

Commit

Permalink
Merge branch 'updates' into feature-qrcode
Browse files Browse the repository at this point in the history
  • Loading branch information
jfederico committed Aug 15, 2017
2 parents ce4c945 + f66f3d4 commit 9db643a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/assets/javascripts/landing.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
var qrcode;

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) {
$(".center-panel-wrapper").html(html);
});
Expand All @@ -41,7 +41,7 @@
Meeting.clear();
var nameInput = $('.meeting-user-name');
if (!nameInput.val()) {
var lastName = Window.localStorage.getItem('lastJoinedName');
var lastName = window.localStorage.getItem('lastJoinedName');
if (lastName !== 'undefined') {
nameInput.val(lastName);
}
Expand Down

0 comments on commit 9db643a

Please sign in to comment.