Merge pull request #115 from albert-gonzalez/negative-tenths-fix

Negative tenth of a second counter fix

Author: albert-gonzalez

package-lock.json

@@ -32,30 +32,30 @@
   "author": "Albert Gonzalez",
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.12.3",
-    "@babel/preset-env": "^7.12.1",
+    "@babel/core": "^7.13.8",
+    "@babel/preset-env": "^7.13.8",
     "babel-plugin-prismjs": "^2.0.1",
-    "bootstrap": "^4.5.3",
-    "chai": "^4.2.0",
-    "eslint": "^7.13.0",
-    "eslint-config-standard": "^16.0.1",
+    "bootstrap": "^4.6.0",
+    "chai": "^4.3.0",
+    "eslint": "^7.21.0",
+    "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.1.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-standard": "^5.0.0",
     "http-server": "~0.12.3",
     "jquery": "^3.5.1",
-    "mocha": "^8.2.1",
+    "mocha": "^8.3.0",
     "popper.js": "^1.16.1",
-    "prismjs": "^1.22.0",
-    "rollup": "^2.33.1",
+    "prismjs": "^1.23.0",
+    "rollup": "^2.40.0",
     "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-css-only": "^2.1.0",
+    "rollup-plugin-css-only": "^3.1.0",
     "rollup-plugin-license": "^2.2.0",
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-uglify": "^6.0.4",
-    "sinon": "^9.2.1"
+    "sinon": "^9.2.4"
   },
   "babel": {
     "presets": [

package.json

@@ -13,7 +13,7 @@ export default {
   plugins: [
     resolve(),
     commonjs(),
-    css({ output: 'dist/examples.min.css' }),
+    css({ output: 'examples.min.css' }),
     babel({
       exclude: 'node_modules/**'
     }),

rollup.config.examples.js

@@ -87,14 +87,15 @@ function Timer (defaultParams = {}) {
   setParams(defaultParams);
 
   function updateCounters (precision, roundedValue) {
+    const unitsPerGroup = groupedUnits[precision];
     totalCounters[precision] = roundedValue;
 
     if (precision === DAYS) {
-      counters[precision] = roundedValue;
+      counters[precision] = Math.abs(roundedValue);
     } else if (roundedValue >= 0) {
-      counters[precision] = mod(roundedValue, groupedUnits[precision]);
+      counters[precision] = mod(roundedValue, unitsPerGroup);
     } else {
-      counters[precision] = groupedUnits[precision] - mod(roundedValue, groupedUnits[precision]);
+      counters[precision] = mod(unitsPerGroup - mod(roundedValue, unitsPerGroup), unitsPerGroup);
     }
   }
 

src/easytimer/easytimer.js

@@ -15,15 +15,15 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start();
   timer.addEventListener('secondsUpdated', function (e) {
     $('#basicUsage').html(timer.getTimeValues().toString());
   });
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start({ precision: 'seconds' });
   timer.addEventListener('secondsUpdated', function (e) {
     $('#gettingValuesExample .days').html(timer.getTimeValues().days);
@@ -41,7 +41,7 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
 
   $('#chronoExample .startButton').click(function () {
     timer.start();
@@ -73,7 +73,7 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start({ precision: 'seconds', startValues: { seconds: 90 }, target: { seconds: 120 } });
   $('#startValuesAndTargetExample .values').html(timer.getTimeValues().toString());
   timer.addEventListener('secondsUpdated', function (e) {
@@ -86,7 +86,7 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start({ countdown: true, startValues: { seconds: 30 } });
   $('#countdownExample .values').html(timer.getTimeValues().toString());
   timer.addEventListener('secondsUpdated', function (e) {
@@ -98,7 +98,7 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start({
     callback: function (timer) {
       $('#callbackExample .values').html(
@@ -109,15 +109,15 @@ $(function () {
 });
 
 $(function () {
-  var timer = new Timer();
+  const timer = new Timer();
   timer.start({ precision: 'secondTenths' });
   timer.addEventListener('secondTenthsUpdated', function (e) {
     $('#secondTenthsExample .values').html(timer.getTimeValues().toString(['hours', 'minutes', 'seconds', 'secondTenths']));
   });
 });
 
 $(function () {
-  var timer = new Timer({ countdown: true, startValues: { seconds: 5 } });
+  const timer = new Timer({ countdown: true, startValues: { seconds: 5 } });
 
   timer.start({ startValues: { seconds: 30 }, target: { seconds: 10 } });
   $('#defaultParamsExample .values').html(timer.getTimeValues().toString());

src/examples/examples.js

@@ -26,13 +26,13 @@ describe('timer.js', function () {
     assert.deepEqual(totalTimes.seconds, totalTimesValues[1]);
     assert.deepEqual(totalTimes.minutes, totalTimesValues[2]);
     assert.deepEqual(totalTimes.hours, totalTimesValues[3]);
-    assert.deepEqual(totalTimes.days, timesValues[4]);
+    assert.deepEqual(totalTimes.days, totalTimesValues[4]);
   }
 
-  function assertEventTriggered (timer, event, millisecons, timesTriggered) {
+  function assertEventTriggered (timer, event, milliseconds, timesTriggered) {
     const callback = sinon.spy();
     timer.addEventListener(event, callback);
-    clock.tick(millisecons);
+    clock.tick(milliseconds);
     sinon.assert.callCount(callback, timesTriggered);
     assert.equal(timer, callback.args[0][0].detail.timer);
   }
@@ -135,6 +135,15 @@ describe('timer.js', function () {
             clock.tick(100);
             assert(params.callback.called);
           });
+
+          it('should allow negative values and update the counter correctly', function () {
+            const startValues = { seconds: -10 };
+            timer.stop();
+            timer.start({ startValues: startValues, precision: 'secondTenths' });
+
+            assertEventTriggered(timer, 'secondTenthsUpdated', 1000, 10);
+            assertTimes(timer, [0, 9, 0, 0, 0], [-90, -9, -0, -0, -0]);
+          });
         });
 
         describe('with seconds precision', function () {
@@ -168,6 +177,15 @@ describe('timer.js', function () {
             clock.tick(1000);
             assert(params.callback.called);
           });
+
+          it('should allow negative values and update the counter correctly', function () {
+            const startValues = { seconds: -10 };
+            timer.stop();
+            timer.start({ startValues, precision: 'seconds' });
+
+            assertEventTriggered(timer, 'secondsUpdated', 11000, 11);
+            assertTimes(timer, [0, 1, 0, 0, 0], [10, 1, 0, 0, 0]);
+          });
         });
 
         describe('with minutes precision', function () {
@@ -201,6 +219,15 @@ describe('timer.js', function () {
             clock.tick(60000);
             sinon.assert.callCount(params.callback, 1);
           });
+
+          it('should allow negative values and update the counter correctly', function () {
+            const startValues = { minutes: -2, seconds: -35 };
+            timer.stop();
+            timer.start({ startValues, precision: 'minutes' });
+
+            assertEventTriggered(timer, 'minutesUpdated', 120000, 2);
+            assertTimes(timer, [0, 35, 0, 0, 0], [-350, -35, -0, -0, -0]);
+          });
         });
 
         describe('with hours precision', function () {
@@ -229,6 +256,15 @@ describe('timer.js', function () {
             clock.tick(3600000);
             sinon.assert.callCount(params.callback, 1);
           });
+
+          it('should allow negative values and update the counter correctly', function () {
+            const startValues = { hours: -1, minutes: -14 };
+            timer.stop();
+            timer.start({ startValues, precision: 'hours' });
+
+            assertEventTriggered(timer, 'hoursUpdated', 3600000, 1);
+            assertTimes(timer, [0, 0, 14, 0, 0], [-8400, -840, -14, -0, -0]);
+          });
         });
       });