Merge pull request #20 from albert-gonzalez/countdown_fix

Countdown fix
albert-gonzalez · Sep 25, 2017 · 154441d · 154441d
2 parents 87db03a + ce1e26c
commit 154441d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "easytimer.js",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "authors": [
     "Albert Gonzalez ([email protected])"
   ],

diff --git a/dist/easytimer.min.js b/dist/easytimer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easytimer.js",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Timer/Chronometer/Countdown compatible with AMD and NodeJS",
   "main": "src/timer.js",
   "directories": {

diff --git a/src/easytimer.js b/src/easytimer.js
@@ -1,5 +1,5 @@
 /**
- * @license easytimer.js v1.2
+ * @license easytimer.js v1.3.2
  * Created by Albert González
  * Licensed under The MIT License.
  *
@@ -241,7 +241,7 @@ var Timer = (
 
                 var interval = unitsInMilliseconds[precision];
 
-                startingDate = Date.now() - totalCounters.secondTenths
+                startingDate = roundTimestamp(Date.now()) - totalCounters.secondTenths
                     * unitsInMilliseconds[SECOND_TENTHS]
                     * timerTypeFactor;
 
@@ -255,7 +255,8 @@ var Timer = (
             }
 
             function updateTimerAndDispatchEvents() {
-                var ellapsedTime = timerTypeFactor > 0 ? (Date.now() - startingDate) : (startingDate - Date.now()),
+                var currentTime = roundTimestamp(Date.now());
+                var ellapsedTime = timerTypeFactor > 0 ? (currentTime - startingDate) : (startingDate - currentTime),
                     valuesUpdated = {};
 
                 valuesUpdated[SECOND_TENTHS] = updateSecondTenths(ellapsedTime);
@@ -272,6 +273,10 @@ var Timer = (
                 }
             }
 
+            function roundTimestamp(timestamp) {
+                return Math.floor(timestamp / unitsInMilliseconds[precision]) * unitsInMilliseconds[precision];
+            }
+
             function dispatchEvents(valuesUpdated) {
                 if (valuesUpdated[SECOND_TENTHS]) {
                     dispatchEvent('secondTenthsUpdated', eventData);