From: Tim Wood <washwithcare@gmail.com>
Date: Tue, 23 Oct 2012 00:57:20 +0000 (-0700)
Subject: Passing unit tests for singular add/subtract #410
X-Git-Tag: 2.0.0~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a334e914de774ac413f9635bbb6c73f3a3366c77;p=thirdparty%2Fmoment.git

Passing unit tests for singular add/subtract #410
---

diff --git a/moment.js b/moment.js
index 01f53f566..08eeea506 100644
--- a/moment.js
+++ b/moment.js
@@ -212,14 +212,14 @@
     // Duration Constructor
     function Duration(duration) {
         var data = this._data = {},
-            years = duration.years || duration.y || 0,
-            months = duration.months || duration.M || 0,
-            weeks = duration.weeks || duration.w || 0,
-            days = duration.days || duration.d || 0,
-            hours = duration.hours || duration.h || 0,
-            minutes = duration.minutes || duration.m || 0,
-            seconds = duration.seconds || duration.s || 0,
-            milliseconds = duration.milliseconds || duration.ms || 0;
+            years = duration.years || duration.year || duration.y || 0,
+            months = duration.months || duration.month || duration.M || 0,
+            weeks = duration.weeks || duration.week || duration.w || 0,
+            days = duration.days || duration.day || duration.d || 0,
+            hours = duration.hours || duration.hour || duration.h || 0,
+            minutes = duration.minutes || duration.minute || duration.m || 0,
+            seconds = duration.seconds || duration.second || duration.s || 0,
+            milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0;
 
         // representation for dateAddRemove
         this._milliseconds = milliseconds +