KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:nixolas1/Zoff into dev

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-04-16 13:15:57 +02:00
parent f74b62e8db babdc8e61d
commit c8b2946116
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/server.js
View File

@@ -105,7 +105,7 @@ io.on('connection', function(socket){
{ {
db.collection(coll).find({now_playing:true}, function(err, docs){ db.collection(coll).find({now_playing:true}, function(err, docs){
if(docs.length > 0 && docs[0]["id"] == arg){ if(docs.length > 0 && docs[0]["id"] == arg){
change_song(coll, arg); change_song(coll, arg, docs[0]["id"]);
} }
}) })
}); });
@@ -324,7 +324,7 @@ function vote(coll, id, guid, socket)
} }
function change_song(coll) function change_song(coll, id, np_id)
{ {
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs[0]["removeplay"] == true) if(docs[0]["removeplay"] == true)
@@ -335,15 +335,34 @@ function change_song(coll)
}) })
}else }else
{ {
db.collection(coll).update({now_playing:true}, if(id === undefined){
{$set:{ console.log("undef");
now_playing:false, db.collection(coll).update({now_playing:true},
votes:0, {$set:{
guids:[] now_playing:false,
}}, function(err, docs) votes:0,
{ guids:[]
change_song_post(coll); }}, function(err, docs)
}); {
console.log(err);
console.log(docs);
change_song_post(coll);
});
}else{
console.log(id);
console.log(np_id);
db.collection(coll).update({now_playing:true, id:id},
{$set:{
now_playing:false,
votes:0,
guids:[]
}}, function(err, docs)
{
console.log(err);
console.log(docs);
change_song_post(coll);
});
}
} }
}) })
} }

3
static/js/youtube.js
View File

@@ -64,7 +64,8 @@ socket.on(chan.toLowerCase()+",np", function(obj)
} }
if(!paused) if(!paused)
ytplayer.playVideo(); ytplayer.playVideo();
ytplayer.seekTo(seekTo); if(ytplayer.getDuration() > seekTo)
ytplayer.seekTo(seekTo);
} }
}); });