]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Passing unit tests for singular add/subtract #410
authorTim Wood <washwithcare@gmail.com>
Tue, 23 Oct 2012 00:57:20 +0000 (17:57 -0700)
committerTim Wood <washwithcare@gmail.com>
Tue, 23 Oct 2012 00:57:20 +0000 (17:57 -0700)
moment.js

index 01f53f566a648c048ef1f6f48c86e434192e7a61..08eeea5062dbd16c0b8ebe015390765c4261ed13 100644 (file)
--- a/moment.js
+++ b/moment.js
     // 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 +