From 994da15f552cf859cb929b2ab713b499e85e90bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Eura=C5=A1?= Date: Sat, 10 Mar 2018 19:07:28 +0100 Subject: [PATCH 1/3] Adds flooring of time elapsed for seeking bar position --- js/components/MainWindow/Position.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/components/MainWindow/Position.js b/js/components/MainWindow/Position.js index 20be46fe..0388c683 100644 --- a/js/components/MainWindow/Position.js +++ b/js/components/MainWindow/Position.js @@ -41,7 +41,7 @@ const Position = ({ }; const mapStateToProps = ({ media, userInput }) => { - const position = media.length ? media.timeElapsed / media.length * 100 : 0; + const position = media.length ? Math.floor(media.timeElapsed) / media.length * 100 : 0; const displayedPosition = userInput.focus === "position" ? userInput.scrubPosition : position; From ea36814d2a631ecfaf52d73972028a307a5835d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Eura=C5=A1?= Date: Sun, 11 Mar 2018 20:26:03 +0100 Subject: [PATCH 2/3] Prettier position percentage calculation --- js/components/MainWindow/Position.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/components/MainWindow/Position.js b/js/components/MainWindow/Position.js index 0388c683..56595f06 100644 --- a/js/components/MainWindow/Position.js +++ b/js/components/MainWindow/Position.js @@ -41,7 +41,8 @@ const Position = ({ }; const mapStateToProps = ({ media, userInput }) => { - const position = media.length ? Math.floor(media.timeElapsed) / media.length * 100 : 0; + const positionPercentage = Math.floor(media.timeElapsed) / media.length * 100; + const position = media.length ? positionPercentage : 0; const displayedPosition = userInput.focus === "position" ? userInput.scrubPosition : position; From 8c4735d245d6a3e457c9c6dc0bbc6802bbe108f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Eura=C5=A1?= Date: Sun, 11 Mar 2018 23:15:32 +0100 Subject: [PATCH 3/3] Refactor for position calculation to account for NaN/0 --- js/components/MainWindow/Position.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/components/MainWindow/Position.js b/js/components/MainWindow/Position.js index 56595f06..ae5f8713 100644 --- a/js/components/MainWindow/Position.js +++ b/js/components/MainWindow/Position.js @@ -41,8 +41,12 @@ const Position = ({ }; const mapStateToProps = ({ media, userInput }) => { - const positionPercentage = Math.floor(media.timeElapsed) / media.length * 100; - const position = media.length ? positionPercentage : 0; + let position; + if (media.length) { + position = Math.floor(media.timeElapsed) / media.length * 100; + } else { + position = 0; + } const displayedPosition = userInput.focus === "position" ? userInput.scrubPosition : position;