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

Locked password alert shows up correctly

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-04 18:01:05 +02:00
parent 01bb2c02e6
commit fa38f69f75
11 changed files with 206 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
server/public/assets/js/player.js
View File

@@ -229,6 +229,7 @@ var Player = {
},
loadVideoById: function(id){
console.log(id);
if(chromecastAvailable){
castSession.sendMessage("urn:x-cast:zoff.me", {type: "loadVideo", videoId: id});
chrome.cast.media.GenericMediaMetadata({metadataType: "GENERIC", title:song_title, image: 'https://img.youtube.com/vi/'+id+'/mqdefault.jpg'});
@@ -307,29 +308,32 @@ var Player = {
errorHandler: function(newState)
{
if(newState.data == 5 || newState.data == 100 ||
newState.data == 101 || newState.data == 150)
{
/*if(Player.count == 2){
Player.count = 0;*/
/*Helper.log("Before: " + Player.before_load);
Helper.log("Now: " + video_id);
Helper.log("After: " + Player.after_load);
Helper.log(Player.before_load == Player.player.getVideoUrl);*/
curr_playing = Player.player.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
if(!user_auth_started) {
if(newState.data == 5 || newState.data == 100 ||
newState.data == 101 || newState.data == 150)
{
/*if(Player.count == 2){
Player.count = 0;*/
/*Helper.log("Before: " + Player.before_load);
Helper.log("Now: " + video_id);
Helper.log("After: " + Player.after_load);
Helper.log(Player.before_load == Player.player.getVideoUrl);*/
curr_playing = Player.player.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase});
//Helper.log(video_id, Player.player.getVideoUrl(), Player.player.getPlayerState());
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase});
//Helper.log(video_id, Player.player.getVideoUrl(), Player.player.getPlayerState());
/*}else{
setTimeout(function(){
Player.loadVideoById(video_id);
Player.count ++;
}, Math.floor((Math.random() * 100) + 1));
}*/
}else if(video_id !== undefined)
Player.loadVideoById(video_id);
/*}else{
setTimeout(function(){
Player.loadVideoById(video_id);
Player.count ++;
}, Math.floor((Math.random() * 100) + 1));
}*/
}else if(video_id !== undefined) {
Player.loadVideoById(video_id);
}
}
},
onPlayerReady: function(event) {
@@ -477,8 +481,9 @@ var Player = {
/*try{
//duration = Player.player.getDuration();
}catch(e){};*/
if(duration !== undefined){
try{
try{
if(!user_auth_avoid && duration !== undefined){
if(!Player.stopInterval) durationBegun = true;
dMinutes = Math.floor(duration / 60);
dSeconds = duration - dMinutes * 60;
@@ -495,9 +500,10 @@ var Player = {
per = 0;
if(!dragging) $("#bar").width(per+"%");
}catch(e){
}
}catch(e){
}
if(!Player.stopInterval) setTimeout(Player.durationSetter, 1000);
},