KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-09-17 21:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made improvements to find

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-06 14:07:03 +02:00
parent 95a15f4b6e
commit b429f646f3
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/public/assets/dist/embed.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
server/public/assets/dist/main.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
server/public/assets/js/list.js
+6
View File
@@ -108,10 +108,14 @@ var List = {
if(full_playlist.length > 0) { if(full_playlist.length > 0) {
Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id}); Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id});
} }
found_array = [];
found_array_index = 0;
//if(!w_p) List.dragging(true); //if(!w_p) List.dragging(true);
break; break;
case "deleted": case "deleted":
List.deleted_song(msg.value, msg.removed); List.deleted_song(msg.value, msg.removed);
found_array = [];
found_array_index = 0;
break; break;
case "vote": case "vote":
if(!offline){ if(!offline){
@@ -120,6 +124,8 @@ var List = {
Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id}); Player.sendNext({title: full_playlist[0].title, videoId: full_playlist[0].id});
} }
} }
found_array = [];
found_array_index = 0;
//if(!w_p) List.dragging(true); //if(!w_p) List.dragging(true);
break; break;
case "song_change": case "song_change":
server/public/assets/js/player.js
+5 -5
View File
@@ -169,9 +169,9 @@ var Player = {
Helper.log("---------------------------------"); Helper.log("---------------------------------");
switch(newState.data) switch(newState.data)
{ {
case -1: case YT.PlayerState.UNSTARTED:
break; break;
case 0: case YT.PlayerState.ENDED:
playing = false; playing = false;
paused = false; paused = false;
if(!offline) { if(!offline) {
@@ -180,7 +180,7 @@ var Player = {
Player.playNext(); Player.playNext();
} }
break; break;
case 1: case YT.PlayerState.PLAYING:
if(!window.MSStream) { if(!window.MSStream) {
$("#player").css("opacity", "1"); $("#player").css("opacity", "1");
if(!Helper.mobilecheck()) $("#channel-load").css("display", "none"); if(!Helper.mobilecheck()) $("#channel-load").css("display", "none");
@@ -204,7 +204,7 @@ var Player = {
paused = false; paused = false;
} }
break; break;
case 2: case YT.PlayerState.PAUSED:
if(!chromecastAvailable){ if(!chromecastAvailable){
if(beginning && mobile_beginning) { if(beginning && mobile_beginning) {
$("#playpause").css("visibility", "visible"); $("#playpause").css("visibility", "visible");
@@ -216,7 +216,7 @@ var Player = {
mobile_beginning = true; mobile_beginning = true;
} }
break; break;
case 3: case YT.PlayerState.BUFFERING:
break; break;
} }
}, },
server/public/assets/js/playercontrols.js
+4 -4
View File
@@ -54,7 +54,7 @@ var Playercontrols = {
play_pause: function() play_pause: function()
{ {
if(!chromecastAvailable){ if(!chromecastAvailable){
if(Player.player.getPlayerState() == 1) if(Player.player.getPlayerState() == YT.PlayerState.PLAYING)
{ {
Player.pauseVideo(); Player.pauseVideo();
if(Helper.mobilecheck() && !window.MSStream){ if(Helper.mobilecheck() && !window.MSStream){
@@ -63,7 +63,7 @@ var Playercontrols = {
$(".video-container").toggleClass("click-through"); $(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra"); $(".page-footer").toggleClass("padding-bottom-extra");
} }
} else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0 || (Player.player.getPlayerState() === 5)){ } else if(Player.player.getPlayerState() == YT.PlayerState.PAUSED || Player.player.getPlayerState() === YT.PlayerState.ENDED || (Player.player.getPlayerState() === YT.PlayerState.CUED)){
Player.playVideo(); Player.playVideo();
//if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){ //if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
if(Helper.mobilecheck() && !window.MSStream){ if(Helper.mobilecheck() && !window.MSStream){
@@ -216,10 +216,10 @@ var Playercontrols = {
{ {
state = Player.player.getPlayerState(); state = Player.player.getPlayerState();
button = document.getElementById("playpause"); button = document.getElementById("playpause");
if(state == 1) if(state == YT.PlayerState.PLAYING)
{ {
Player.pauseVideo(); Player.pauseVideo();
}else if(state == 2) }else if(state == YT.PlayerState.PAUSED)
{ {
Player.playVideo(); Player.playVideo();
} }