mirror of https://github.com/calzoneman/sync.git
So much work
This commit is contained in:
parent
1850f009ff
commit
de2294d3ab
|
@ -466,9 +466,10 @@ Callbacks = {
|
||||||
},
|
},
|
||||||
|
|
||||||
drinkCount: function(count) {
|
drinkCount: function(count) {
|
||||||
|
console.log(count);
|
||||||
if(count != 0) {
|
if(count != 0) {
|
||||||
var text = count + " drink";
|
var text = count + " drink";
|
||||||
if(data.count != 1) {
|
if(count != 1) {
|
||||||
text += "s";
|
text += "s";
|
||||||
}
|
}
|
||||||
$("#drinkcount").text(text);
|
$("#drinkcount").text(text);
|
||||||
|
|
|
@ -501,6 +501,10 @@ Player.prototype.update = function(data) {
|
||||||
data.currentTime = 0;
|
data.currentTime = 0;
|
||||||
}
|
}
|
||||||
this.load(data);
|
this.load(data);
|
||||||
|
this.play();
|
||||||
|
}
|
||||||
|
if(CLIENT.leader) {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
if(!USEROPTS.synch) {
|
if(!USEROPTS.synch) {
|
||||||
return;
|
return;
|
||||||
|
@ -512,9 +516,6 @@ Player.prototype.update = function(data) {
|
||||||
else {
|
else {
|
||||||
this.play();
|
this.play();
|
||||||
}
|
}
|
||||||
if(CLIENT.leader) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
this.getTime(function(seconds) {
|
this.getTime(function(seconds) {
|
||||||
var time = data.currentTime;
|
var time = data.currentTime;
|
||||||
var diff = time - seconds || time;
|
var diff = time - seconds || time;
|
||||||
|
|
|
@ -24,6 +24,7 @@ generateToggle("#playlisttoggle", "#playlist_controls");
|
||||||
|
|
||||||
/* navbar stuff */
|
/* navbar stuff */
|
||||||
$("#optlink").click(showOptionsMenu);
|
$("#optlink").click(showOptionsMenu);
|
||||||
|
$("#chatonly").click(chatOnly);
|
||||||
|
|
||||||
function guestLogin() {
|
function guestLogin() {
|
||||||
socket.emit("login", {
|
socket.emit("login", {
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -29,6 +29,7 @@
|
||||||
<li><a href="help.html">Help</a></li>
|
<li><a href="help.html">Help</a></li>
|
||||||
<li><a href="account.html">Account</a></li>
|
<li><a href="account.html">Account</a></li>
|
||||||
<li><a href="javascript:void(0)" id="optlink">Options</a></li>
|
<li><a href="javascript:void(0)" id="optlink">Options</a></li>
|
||||||
|
<li><a href="javascript:void(0)" id="chatonly">Chat Only</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="navbar-form pull-right" id="loginform">
|
<div class="navbar-form pull-right" id="loginform">
|
||||||
<input type="text" id="guestname" placeholder="Name">
|
<input type="text" id="guestname" placeholder="Name">
|
||||||
|
|
Loading…
Reference in New Issue