fix/multiple zero removel & code refactor

Iskren1990 · Sep 25, 2020 · d25825f · d25825f
1 parent 1274968
commit d25825f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/scripts/animations.js b/scripts/animations.js
@@ -1,5 +1,5 @@
 import { elements } from './elements.js';
-import { setLeadingZero } from './utils.js';
+import { formatTimeContent } from './utils.js';
 // import { showProgress } from './progress-bars.js';
 
 let animationId;
@@ -17,10 +17,10 @@ function startUpdateSeconds(elapsedTime) {
 
         if (seconds > 0) {
             const changedSeconds = seconds - 1;
-            elements.time.seconds().textContent = setLeadingZero(changedSeconds);
+            elements.time.seconds().textContent = formatTimeContent(changedSeconds);
         } else if (minutes > 0) {
             const changedMinutes = minutes - 1;
-            elements.time.minutes().textContent = setLeadingZero(changedMinutes);
+            elements.time.minutes().textContent = formatTimeContent(changedMinutes);
             elements.time.seconds().textContent = 59;
         }
         // showProgress(minutes, seconds, countdownTime);

diff --git a/scripts/modal.js b/scripts/modal.js
@@ -1,5 +1,5 @@
 import { elements } from './elements.js';
-import { setLeadingZero } from './utils.js';
+import { formatTimeContent } from './utils.js';
 import { isStartedYet } from './controls.js';
 
 const { closeButton, form, modalOverlay, modal, suggestions } = elements.modal;
@@ -27,13 +27,13 @@ function setTheTimer(e) {
 
     e.preventDefault();
 
-    const [minutesVal, secondsVal] = [...document.querySelectorAll('form input')].map((e) => setLeadingZero(e.value));
+    const [minutesVal, secondsVal] = [...document.querySelectorAll('form input')].map((e) => formatTimeContent(e.value));
 
-    const suggestedPick = e.suggestedPick ? setLeadingZero(e.suggestedPick) : false;
-    const timeFromForm = (minutesVal > 0 ? minutesVal : "00");
+    const suggestedPick = e.suggestedPick ? formatTimeContent(e.suggestedPick) : false;
+    const timeFromForm = formatTimeContent(minutesVal);
 
     minutes().textContent = suggestedPick || timeFromForm;
-    seconds().textContent = (secondsVal > 0 ? secondsVal : "00");
+    seconds().textContent = formatTimeContent(secondsVal);
 
     toggleModal();
 

diff --git a/scripts/utils.js b/scripts/utils.js
@@ -29,20 +29,16 @@ export function manageQueryString(search) {
     const queries = parseQueryString(search);
     if (queries) {
         const { m, s } = extractTimeQuery(queries);
-        elements.time.minutes().textContent = formatTextContent(m);
-        elements.time.seconds().textContent = formatTextContent(s);
+        elements.time.minutes().textContent = formatTimeContent(m);
+        elements.time.seconds().textContent = formatTimeContent(s);
 
         if (queries.on === "true") { elements.info.timerState().click(); }
         if (queries.mod === "false") { elements.modal.closeButton().click(); }
     }
 }
 
-export function setLeadingZero(value) {
-    return Number(value) > 9 ? value : `0${value}`;
-}
-
-export function formatTextContent(textContent) {
-    return textContent || '00';
+export function formatTimeContent(value) {
+    return Number(value).toString().padStart(2, 0);
 }
 
 export function manageAudio() {