technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 21:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/refresh_queue' into 'master'

Browse Source 
Update time only instead of rendering the whole queue every second.

See merge request !10
This commit is contained in:
Jim Driessen
2017-09-04 15:35:42 +02:00
parent e8aeb271b9 340b9e330f
commit aadeb44b43
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
marietje/marietje/static/js/queue.js
View File

@ -158,7 +158,7 @@ function updateTime()
if (secondsLeft >= 0) if (secondsLeft >= 0)
{ {
$('.currentsong .time-left').text(secondsLeft.secondsToHHMMSS()); $('.currentsong .time-left').text(secondsLeft.secondsToHHMMSS());
renderQueue(secondsLeft + timestamp, timestamp); refreshSeconds(secondsLeft + timestamp, timestamp);
} }
// Refresh every ten seconds, or if the song has ended in the last ten // Refresh every ten seconds, or if the song has ended in the last ten
@ -173,7 +173,6 @@ function renderQueue(playNextAt, now)
{ {
$('.queuebody').empty(); $('.queuebody').empty();
var timeToPlay = playNextAt - now; var timeToPlay = playNextAt - now;
var firstSongInQueue = true;
$.each(queue, function (id, song) { $.each(queue, function (id, song) {
var requestedBy = song.requested_by; var requestedBy = song.requested_by;
var canDelete = song.can_move_down || canMoveSongs; var canDelete = song.can_move_down || canMoveSongs;
@ -238,6 +237,19 @@ function refreshQueue()
}); });
} }
function refreshSeconds(playNextAt, now)
{
if(!showTimeToPlay) {
return;
}
var timeToPlay = playNextAt - now;
times = $('.plays-at');
$.each(queue, function (id, song) {
$(times[id]).text(timeToPlay < 0 ? '' : timeToPlay.secondsToHHMMSS());
timeToPlay += parseInt(song.song.duration);
});
}
function getSongs() function getSongs()
{ {
var all = $('#search-all').val(); var all = $('#search-all').val();