Removed spotify and fixed error with panel

This commit is contained in:
Kasper Rynning-Tønnesen
2016-09-09 15:56:48 +02:00
parent 38817162b3
commit 814252375a
6 changed files with 100 additions and 103 deletions

View File

@@ -960,7 +960,7 @@ ul #chat-log{
margin-top:15px;
}
#playlist_loader, #playlist_loader_spotify, #playlist_loader_export {
.playlist_loader_padding{
padding: 10px 0px 0px 70px;
background-color: white !important;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +0,0 @@
!function(){function e(e){var t,o=e.substring(1).split("&"),n={};for(var a in o)t=o[a].split("="),2==t.length&&(n[t[0]]=t[1]);return n}window.addEventListener("load",function(){var t,o,n,a=e(window.location.hash);window.location.protocol+"//"+window.location.hostname+"/callback";if(a.spotify)t="b934ecdd173648f5bcd38738af529d58",o="token",n="playlist-read-private playlist-read-collaborative user-read-private",console.log("spotify");else if(a.youtube)t="",o="",n="",console.log("youtube");else{var i=e(window.location.hash);window.opener.callback(i)}})}();

View File

@@ -30,8 +30,13 @@ var Player = {
Player.player.stopVideo();
}catch(e){}
//List.importOldList(channel.toLowerCase());
}
else{
} else if(paused){
Player.getTitle(obj.np[0].title, viewers);
//Player.setBGimage(video_id);
Player.notifyUser(obj.np[0].id, obj.np[0].title);
Player.player.stopVideo();
}else if(!paused){
//Helper.log("gotten new song");
if(previous_video_id === undefined)
previous_video_id = obj.np[0].id;
@@ -70,7 +75,6 @@ var Player = {
if(paused)
Player.player.pauseVideo();
}
if(!paused){
if(!mobile_beginning)
Player.player.playVideo();
@@ -112,6 +116,7 @@ var Player = {
socket.emit("end", {id: video_id, channel: chan.toLowerCase()});
break;
case 1:
playing = true;
if(beginning && Helper.mobilecheck()){
Player.player.pauseVideo();