From: Ian W. Remmel <engineering@ianwremmel.com>
Date: Fri, 13 Sep 2013 23:18:59 +0000 (-0400)
Subject: rerolled to modify `aspNetTimeSpanJsonRegex` rather than introduce a new regex pattern
X-Git-Tag: 2.3.0~41^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1059%2Fhead;p=thirdparty%2Fmoment.git

rerolled to modify `aspNetTimeSpanJsonRegex` rather than introduce a new regex pattern
---

diff --git a/moment.js b/moment.js
index 69b96409c..1dd866f03 100644
--- a/moment.js
+++ b/moment.js
@@ -21,9 +21,7 @@
 
         // ASP.NET json date format regex
         aspNetJsonRegex = /^\/?Date\((\-?\d+)/i,
-        aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,
-
-    twentyFourHourTimeRegex = /(\d{2})\:(\d{2})/,
+        aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,
 
         // format tokens
         formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,
@@ -1127,7 +1125,6 @@
             isNumber = (typeof input === 'number'),
             duration = (isDuration ? input._input : (isNumber ? {} : input)),
             matched = aspNetTimeSpanJsonRegex.exec(input),
-        twentyFourHourMatched = twentyFourHourTimeRegex.exec(input),
             sign,
             ret;
 
@@ -1147,15 +1144,6 @@
                 s: ~~matched[5] * sign,
                 ms: ~~matched[6] * sign
             };
-        } else if (twentyFourHourMatched) {
-            duration = {
-                y: 0,
-                d: 0,
-                h: ~~twentyFourHourMatched[1],
-                m: ~~twentyFourHourMatched[2],
-                s: 0,
-                ms: 0
-            };
         }
 
         ret = new Duration(duration);