From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Mon, 16 Sep 2013 10:50:15 +0000 (-0700)
Subject: Addressed @icambron remarks
X-Git-Tag: 2.3.0~28^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c200efd93912b042b228eda4fc9dfdd3e6756b33;p=thirdparty%2Fmoment.git

Addressed @icambron remarks
---

diff --git a/moment.js b/moment.js
index 8a06a7b1d..7cc2889da 100644
--- a/moment.js
+++ b/moment.js
@@ -918,7 +918,8 @@
     // date from string and format string
     function makeDateFromStringAndFormat(config) {
         if (config._strict) {
-            return makeDateFromStringAndStrictFormat(config);
+            makeDateFromStringAndStrictFormat(config);
+            return;
         }
         // This array is used to make a Date, either with `new Date` or `Date.UTC`
         var lang = getLangDefinition(config._l),
@@ -984,11 +985,18 @@
 
             return token;
         });
+
+        // Handle stuff after last formatting token.
+        if (non_token_start != config._f.length) {
+            regexp += regexpEscape(unescapeFormat(config._f.substring(non_token_start)));
+        }
         regexp = new RegExp('^' + regexp + '$');
         match = config._i.match(regexp);
         if (match === null) {
+            config._a = [];
+            config._d = new Date(0);
             config._isValid = false;
-            return null;
+            return;
         }
 
         config._a = [];
@@ -1191,9 +1199,9 @@
     }
 
     moment = function (input, format, lang, strict) {
-        if (lang === true) {
+        if (typeof(lang) === "boolean") {
+            strict = lang;
             lang = undefined;
-            strict = true;
         }
         return makeMoment({
             _i : input,
@@ -1206,9 +1214,9 @@
 
     // creating with utc
     moment.utc = function (input, format, lang, strict) {
-        if (lang === true) {
+        if (typeof(lang) === "boolean") {
+            strict = lang;
             lang = undefined;
-            strict = true;
         }
         return makeMoment({
             _useUTC : true,