From ac435919e76e13fcef74113b4f760c20864fe0db Mon Sep 17 00:00:00 2001 From: James Barnsley Date: Fri, 8 Sep 2017 14:32:44 +1200 Subject: [PATCH] When minutes or seconds zero, make string 00, fixes #188 --- src/js/components/Dater.js | 13 +++++++------ src/js/components/Notifications.js | 6 +++--- src/scss/components/_playback-controls.scss | 4 ++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/js/components/Dater.js b/src/js/components/Dater.js index e7ce2704..d580dcc8 100755 --- a/src/js/components/Dater.js +++ b/src/js/components/Dater.js @@ -26,16 +26,17 @@ export default class Dater extends React.Component{ // get left-over number of seconds seconds = total_seconds - ( total_minutes * 60 ) - if( seconds <= 9 ) seconds = '0'+ seconds + if (seconds <= 9) seconds = '0'+ seconds + if (seconds == 0) seconds = '00' // get left-over number of minutes minutes = total_minutes - ( total_hours * 60 ) - if( minutes <= 9 && total_hours ) minutes = '0'+ minutes - if( minutes == 0 ) minutes = '0' + if (minutes <= 9 && total_hours) minutes = '0'+ minutes + if (minutes == 0) minutes = '00' - if( total_hours ) string += total_hours+':' - if( minutes ) string += minutes+':' - if( seconds ) string += seconds + if (total_hours) string += total_hours+':' + if (minutes) string += minutes+':' + if (seconds) string += seconds return string } diff --git a/src/js/components/Notifications.js b/src/js/components/Notifications.js index 4ca8c553..4aea9614 100755 --- a/src/js/components/Notifications.js +++ b/src/js/components/Notifications.js @@ -40,9 +40,9 @@ export default class Notifications extends React.Component{ renderProcess(process){ - var progress = ((process.data.total - process.data.remaining) / process.data.total * 100).toFixed() - if (isNaN(progress)){ - progress = 0 + var progress = 0; + if (process.data.total && process.data.remaining){ + progress = ((process.data.total - process.data.remaining) / process.data.total * 100).toFixed() } switch (process.status){ diff --git a/src/scss/components/_playback-controls.scss b/src/scss/components/_playback-controls.scss index 3f662560..8a0c4651 100755 --- a/src/scss/components/_playback-controls.scss +++ b/src/scss/components/_playback-controls.scss @@ -138,6 +138,10 @@ bottom: 2px; left: 60px; right: 60px; + + .progress { + @include animate(1s, linear); + } } .current {