bug fix when returning value object and dates are equal

Author: codebox

moment-precise-range.js

@@ -49,6 +49,17 @@ if (typeof moment === "undefined" && typeof require === 'function') {
         return result.join(STRINGS.delimiter);
     }
 
+    function buildValueObject(yDiff, mDiff, dDiff, hourDiff, minDiff, secDiff, firstDateWasLater) {
+        return {
+            "years"   : yDiff,
+            "months"  : mDiff,
+            "days"    : dDiff,
+            "hours"   : hourDiff,
+            "minutes" : minDiff,
+            "seconds" : secDiff,
+            "firstDateWasLater" : firstDateWasLater
+        }
+    }
     moment.fn.preciseDiff = function(d2, returnValueObject) {
         return moment.preciseDiff(this, d2, returnValueObject);
     };
@@ -59,7 +70,11 @@ if (typeof moment === "undefined" && typeof require === 'function') {
         m1.add(m2.utcOffset() - m1.utcOffset(), 'minutes'); // shift timezone of m1 to m2
 
         if (m1.isSame(m2)) {
-            return STRINGS.nodiff;
+            if (returnValueObject) {
+                return buildValueObject(0, 0, 0, 0, 0, 0, false);
+            } else {
+                return STRINGS.nodiff;
+            }
         }
         if (m1.isAfter(m2)) {
             var tmp = m1;
@@ -104,15 +119,7 @@ if (typeof moment === "undefined" && typeof require === 'function') {
         }
 
         if (returnValueObject) {
-            return {
-                "years"   : yDiff,
-                "months"  : mDiff,
-                "days"    : dDiff,
-                "hours"   : hourDiff,
-                "minutes" : minDiff,
-                "seconds" : secDiff,
-                "firstDateWasLater" : firstDateWasLater
-            };
+            return buildValueObject(yDiff, mDiff, dDiff, hourDiff, minDiff, secDiff, firstDateWasLater);
         } else {
             return buildStringFromValues(yDiff, mDiff, dDiff, hourDiff, minDiff, secDiff);
         }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moment-precise-range-plugin",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "This is a plugin for the moment.js JavaScript library, to display date/time ranges precisely, in a human-readable format.",
   "main": "moment-precise-range.js",
   "files": [
@@ -18,7 +18,7 @@
     "url": "git+https://github.com/codebox/moment-precise-range.git"
   },
   "tonicExampleFilename" : "example/example.js",
-  "author": "Rob Dawson <rob@codebox.org.uk> (http://codebox.org.uk)",
+  "author": "Rob Dawson <rob@codebox.net> (https://codebox.net)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/codebox/moment-precise-range/issues"

test/tests/moment-precise-range-test.js

@@ -139,6 +139,9 @@ describe("preciseDiff", function() {
         it("all values", function () {
             test('2001-11-12 13:01:43+0000', '2014-02-01 01:03:01+0000', 12, 2, 19, 12, 1, 18, false);
         });
+        it("equal values", function () {
+            test('2001-11-12 13:01:43+0000', '2001-11-12 13:01:43+0000', 0, 0, 0, 0, 0, 0, false);
+        });
         it("multiple values", function() {
             test('2013-10-21 10:15:40+0000', '2014-02-02 01:01:01+0000', 0, 3, 11, 15, 45, 21, false);
             test('2013-12-31 23:58:10+0000', '2014-01-01 00:02:08+0000', 0, 0,  0,  0,  3, 58, false);