From: Xotic750 <xotic750@gmail.com>
Date: Mon, 16 Sep 2013 16:02:34 +0000 (+0200)
Subject: Improve dateFromObject to utilise the normalizedUnits method.
X-Git-Tag: 2.3.0~33^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1103%2Fhead;p=thirdparty%2Fmoment.git

Improve dateFromObject to utilise the normalizedUnits method.

User object will now handle any acceptable capitalisation, aliasing or pluralisation.
---

diff --git a/moment.js b/moment.js
index 34f22fcc2..de252f803 100644
--- a/moment.js
+++ b/moment.js
@@ -854,20 +854,32 @@
     }
 
     function dateFromObject(config) {
-        var o = config._i;
+        var normalizedInput = {},
+            normalizedProp,
+            prop,
+            index;
 
         if (config._d) {
             return;
         }
 
+        for (prop in config._i) {
+            if (config._i.hasOwnProperty(prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = config._i[prop];
+                }
+            }
+        }
+
         config._a = [
-            o.years || o.year || o.y,
-            o.months || o.month || o.M,
-            o.days || o.day || o.d,
-            o.hours || o.hour || o.h,
-            o.minutes || o.minute || o.m,
-            o.seconds || o.second || o.s,
-            o.milliseconds || o.millisecond || o.ms
+            normalizedInput.year,
+            normalizedInput.month,
+            normalizedInput.day,
+            normalizedInput.hour,
+            normalizedInput.minute,
+            normalizedInput.second,
+            normalizedInput.millisecond
         ];
 
         dateFromArray(config);