diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 78103597..100c285a 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -466,9 +466,10 @@ Callbacks = { }, drinkCount: function(count) { + console.log(count); if(count != 0) { var text = count + " drink"; - if(data.count != 1) { + if(count != 1) { text += "s"; } $("#drinkcount").text(text); diff --git a/www/assets/js/player.js b/www/assets/js/player.js index 1b83b179..6a914bfd 100644 --- a/www/assets/js/player.js +++ b/www/assets/js/player.js @@ -501,6 +501,10 @@ Player.prototype.update = function(data) { data.currentTime = 0; } this.load(data); + this.play(); + } + if(CLIENT.leader) { + return; } if(!USEROPTS.synch) { return; @@ -512,9 +516,6 @@ Player.prototype.update = function(data) { else { this.play(); } - if(CLIENT.leader) { - return; - } this.getTime(function(seconds) { var time = data.currentTime; var diff = time - seconds || time; diff --git a/www/assets/js/ui.js b/www/assets/js/ui.js index af17e87f..52a2966a 100644 --- a/www/assets/js/ui.js +++ b/www/assets/js/ui.js @@ -24,6 +24,7 @@ generateToggle("#playlisttoggle", "#playlist_controls"); /* navbar stuff */ $("#optlink").click(showOptionsMenu); +$("#chatonly").click(chatOnly); function guestLogin() { socket.emit("login", { diff --git a/www/assets/js/util.js b/www/assets/js/util.js index 845bb0aa..cbf22148 100644 --- a/www/assets/js/util.js +++ b/www/assets/js/util.js @@ -1,1035 +1,1037 @@ -function makeAlert(title, text, klass) { - if(!klass) { - klass = "alert-info"; - } - - var al = $("
").addClass("alert") - .addClass(klass) - .text(text); - $("
").prependTo(al); - $("").text(title).prependTo(al); - $("