andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak timer display to show song duration as early as possible.

Browse Source 
Also initializes timers to '' instead of '0:00' - more consistent behaviour between streams and tracks.
This commit is contained in:
jcass 2016-02-15 09:10:39 +02:00
parent a28969aa9e
commit c39d03335c
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mopidy_musicbox_webclient/static/js/progress_timer.js
View File

@ -1,7 +1,7 @@
var progressTimer;
var progressElement = document.getElementById('trackslider');
var positionNode = document.createTextNode('0:00');
var durationNode = document.createTextNode('0:00');
var positionNode = document.createTextNode('');
var durationNode = document.createTextNode('');
var START_BEATS = 5 // 0.5 seconds, needs to be less than 1s to prevent unwanted updates.
var RUN_BEATS = 300 // 30 seconds assuming default timer update rate of 100ms
@ -48,7 +48,9 @@ function updateTimers(position, duration, isRunning) {
positionNode.nodeValue = '';
durationNode.nodeValue = '';
$("#trackslider").val(0).slider('refresh');
} else if (syncing) {
} else {
durationNode.nodeValue = format(duration || Infinity);
if (syncing) {
if (!targetPosition) {
// Waiting for Mopidy to provide a target position.
positionNode.nodeValue = '(wait)';
@ -56,12 +58,9 @@ function updateTimers(position, duration, isRunning) {
// Busy seeking to new target position.
positionNode.nodeValue = '(sync)';
}
} else if (streaming) {
} else if (synced || streaming) {
positionNode.nodeValue = format(position);;
durationNode.nodeValue = '(n/a)';
} else if (synced) {
positionNode.nodeValue = format(position);
durationNode.nodeValue = format(duration || 0);
}
}
if (ok) {
@ -111,7 +110,9 @@ function toInt(value) {
function format(milliseconds) {
if (milliseconds === Infinity) {
return '0:00';
return '(n/a)';
} else if (milliseconds == 0) {
return '';
}
var seconds = Math.floor(milliseconds / 1000);