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

Fixing an issue with skipping a song sometimes changes the pagination

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2019-01-14 19:21:31 +01:00
parent 5086fb56e6
commit 697c7fa88f
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/public/assets/js/functions.js
View File

@@ -56,7 +56,7 @@ function resizeFunction() {
ytPlaying = Player.player.getPlayerState() == YT.PlayerState.PLAYING || Player.player.getPlayerState() == YT.PlayerState.BUFFERING; ytPlaying = Player.player.getPlayerState() == YT.PlayerState.PLAYING || Player.player.getPlayerState() == YT.PlayerState.BUFFERING;
} catch(e) {} } catch(e) {}
scPlaying = !paused; scPlaying = !paused;
resizePlaylistPlaying(ytPlaying || scPlaying); resizePlaylistPlaying(ytPlaying || scPlaying, true);
return; return;
}) })
} else { } else {
@@ -66,7 +66,7 @@ function resizeFunction() {
try { try {
scPlaying = Player.soundcloud_player.isPlaying(); scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){} } catch(e){}
resizePlaylistPlaying(ytPlaying || scPlaying); resizePlaylistPlaying(ytPlaying || scPlaying, true);
} }
return; return;
} }
@@ -1012,7 +1012,7 @@ function seekToMove(e){
} catch(e){} } catch(e){}
} }
function resizePlaylistPlaying(playing) { function resizePlaylistPlaying(playing, resizing) {
if(document.querySelector("#wrapper") == null || embed || client) return; if(document.querySelector("#wrapper") == null || embed || client) return;
if(window.innerWidth < 601) { if(window.innerWidth < 601) {
var subtract = 0; var subtract = 0;
@@ -1068,7 +1068,7 @@ function resizePlaylistPlaying(playing) {
Helper.css(".list-song", "height", List.element_height + "px"); Helper.css(".list-song", "height", List.element_height + "px");
Channel.set_title_width(); Channel.set_title_width();
var toJumpTo = page / canFit; var toJumpTo = page / canFit;
if(toJumpTo > Math.floor(full_playlist.length / List.can_fit)) { if(toJumpTo > Math.floor(full_playlist.length / List.can_fit) && resizing) {
toJumpTo = Math.floor(full_playlist.length / List.can_fit); toJumpTo = Math.floor(full_playlist.length / List.can_fit);
} }
List.dynamicContentPageJumpTo(toJumpTo); List.dynamicContentPageJumpTo(toJumpTo);

33
server/public/assets/js/list.js
View File

@@ -84,13 +84,15 @@ var List = {
changedValues: function(song) { changedValues: function(song) {
if(song.type == "suggested") { if(song.type == "suggested") {
document.querySelector("#suggested-" + song.id).querySelector(".vote-container").setAttribute("title", song.title); try {
document.querySelector("#suggested-" + song.id).querySelector(".list-title").setAttribute("title", song.title); document.getElementById("#suggested-" + song.id).querySelector(".vote-container").setAttribute("title", song.title);
document.querySelector("#suggested-" + song.id).querySelector(".list-title").innerText = song.title; document.getElementById("#suggested-" + song.id).querySelector(".list-title").setAttribute("title", song.title);
var _temp_duration = Helper.secondsToOther(song.duration); document.getElementById("#suggested-" + song.id).querySelector(".list-title").innerText = song.title;
document.querySelector("#suggested-" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]); var _temp_duration = Helper.secondsToOther(song.duration);
document.querySelector("#suggested-" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');"); document.getElementById("#suggested-" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]);
document.querySelector("#suggested-" + song.id).setAttribute("id", song.new_id); document.getElementById("#suggested-" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');");
document.getElementById("#suggested-" + song.id).setAttribute("id", song.new_id);
} catch(e) {}
return; return;
} }
var i = List.getIndexOfSong(song.id); var i = List.getIndexOfSong(song.id);
@@ -100,14 +102,15 @@ var List = {
full_playlist[i].start = song.start; full_playlist[i].start = song.start;
full_playlist[i].end = song.end; full_playlist[i].end = song.end;
full_playlist[i].id = song.new_id; full_playlist[i].id = song.new_id;
try {
document.querySelector("#" + song.id).querySelector(".vote-container").setAttribute("title", song.title); document.getElementById("#" + song.id).querySelector(".vote-container").setAttribute("title", song.title);
document.querySelector("#" + song.id).querySelector(".list-title").setAttribute("title", song.title); document.getElementById("#" + song.id).querySelector(".list-title").setAttribute("title", song.title);
document.querySelector("#" + song.id).querySelector(".list-title").innerText = song.title; document.getElementById("#" + song.id).querySelector(".list-title").innerText = song.title;
var _temp_duration = Helper.secondsToOther(song.duration); var _temp_duration = Helper.secondsToOther(song.duration);
document.querySelector("#" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]); document.getElementById("#" + song.id).querySelector(".card-duration").innerText = Helper.pad(_temp_duration[0]) + ":" + Helper.pad(_temp_duration[1]);
document.querySelector("#" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');"); document.getElementById("#" + song.id).querySelector(".list-image").setAttribute("style", "background-image:url('//img.youtube.com/vi/"+song.new_id+"/mqdefault.jpg');");
document.querySelector("#" + song.id).setAttribute("id", song.new_id); document.getElementById("#" + song.id).setAttribute("id", song.new_id);
} catch(e) {}
} }
}, },

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

@@ -159,7 +159,7 @@ var Player = {
Helper.toggleClass(".video-container", "click-through"); Helper.toggleClass(".video-container", "click-through");
Helper.toggleClass(".page-footer", "padding-bottom-extra"); Helper.toggleClass(".page-footer", "padding-bottom-extra");
} }
resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING); resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING, false);
} }
if(embed && !autoplay) autoplay = true; if(embed && !autoplay) autoplay = true;
Helper.css("#player", "opacity", "1"); Helper.css("#player", "opacity", "1");
@@ -223,7 +223,8 @@ var Player = {
Helper.toggleClass(".video-container", "click-through"); Helper.toggleClass(".video-container", "click-through");
Helper.toggleClass(".page-footer", "padding-bottom-extra"); Helper.toggleClass(".page-footer", "padding-bottom-extra");
} }
resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING);
resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING, false);
} }
} }
} }
@@ -237,7 +238,8 @@ var Player = {
if(small_player || !Helper.mobilecheck()) { if(small_player || !Helper.mobilecheck()) {
Helper.css("#player", "opacity", "1"); Helper.css("#player", "opacity", "1");
} }
resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING);
resizePlaylistPlaying(newState.data == YT.PlayerState.PLAYING || newState.data == YT.PlayerState.BUFFERING, false);
break; break;
} }
}, },
@@ -739,9 +741,9 @@ var Player = {
Player.soundcloud_player.isPaused(function(paused) { Player.soundcloud_player.isPaused(function(paused) {
scPlaying = !paused; scPlaying = !paused;
try { try {
resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING); resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING, false);
} catch(e) { } catch(e) {
resizePlaylistPlaying(scPlaying); resizePlaylistPlaying(scPlaying, false);
} }
}); });
} else { } else {
@@ -749,9 +751,9 @@ var Player = {
scPlaying = Player.soundcloud_player.isPlaying(); scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){} } catch(e){}
try { try {
resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING); resizePlaylistPlaying(Player.player.getPlayerState() == YT.PlayerState.PLAYING || scPlaying || Player.player.getPlayerState() == YT.PlayerState.BUFFERING, false);
} catch(e) { } catch(e) {
resizePlaylistPlaying(scPlaying); resizePlaylistPlaying(scPlaying, false);
} }
} }
} }
@@ -812,13 +814,13 @@ var Player = {
if(scUsingWidget) { if(scUsingWidget) {
Player.soundcloud_player.isPaused(function(paused) { Player.soundcloud_player.isPaused(function(paused) {
scPlaying = !paused; scPlaying = !paused;
resizePlaylistPlaying(scPlaying); resizePlaylistPlaying(scPlaying, false);
}); });
} else { } else {
try { try {
scPlaying = Player.soundcloud_player.isPlaying(); scPlaying = Player.soundcloud_player.isPlaying();
} catch(e){} } catch(e){}
resizePlaylistPlaying(scPlaying); resizePlaylistPlaying(scPlaying, false);
} }
} }
Helper.removeClass("#player_overlay", "small-display-hide"); Helper.removeClass("#player_overlay", "small-display-hide");