Merge branch 'master' of github.com:nixolas1/Zoff

This commit is contained in:
Nicolas A. Tonne
2015-05-06 14:02:28 +02:00
4 changed files with 19 additions and 7 deletions

View File

@@ -75,7 +75,7 @@ $('input[class=conf]').change(function()
function pass_save()
{
socket.emit('password', [document.getElementById("password").value, chan.toLowerCase()]);
socket.emit('password', [document.getElementById("password").value, chan.toLowerCase(), guid]);
}
function log_out(){

View File

@@ -120,7 +120,7 @@ function vote(id, vote){
}
function skip(){
socket.emit('skip', [chan, guid]);
socket.emit('skip', [chan, guid, localStorage[chan.toLowerCase()]]);
return true;
}

View File

@@ -96,7 +96,7 @@ $(document).ready(function()
if(localStorage[chan.toLowerCase()])
{
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase()]);
socket.emit("password", [localStorage[chan.toLowerCase()], chan.toLowerCase(), guid]);
}
if($("#chan").html().toLowerCase() == "jazz")