aboutsummaryrefslogtreecommitdiffstats
path: root/bower_components/moment/src/lib/create/from-string.js
diff options
context:
space:
mode:
authorLibravatarAgustin Henze <tin@sluc.org.ar>2015-08-26 07:57:23 -0300
committerLibravatarAgustin Henze <tin@sluc.org.ar>2015-08-26 07:57:23 -0300
commit70ceb871117ca811d63cb02671dc0fefc2700883 (patch)
tree846133ea39797d2cd1101cff2ac0818167353490 /bower_components/moment/src/lib/create/from-string.js
parent8559119e2f45b7f6508282962c0430423bfab051 (diff)
parent787b97a4cb24330b36f11297c6d3a7a473a907d0 (diff)
Merge tag 'upstream/7.6.4'
Upstream version 7.6.4
Diffstat (limited to 'bower_components/moment/src/lib/create/from-string.js')
-rw-r--r--bower_components/moment/src/lib/create/from-string.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/bower_components/moment/src/lib/create/from-string.js b/bower_components/moment/src/lib/create/from-string.js
index 4bd6d59..4a7163b 100644
--- a/bower_components/moment/src/lib/create/from-string.js
+++ b/bower_components/moment/src/lib/create/from-string.js
@@ -36,14 +36,14 @@ export function configFromISO(config) {
getParsingFlags(config).iso = true;
for (i = 0, l = isoDates.length; i < l; i++) {
if (isoDates[i][1].exec(string)) {
- // match[5] should be 'T' or undefined
- config._f = isoDates[i][0] + (match[6] || ' ');
+ config._f = isoDates[i][0];
break;
}
}
for (i = 0, l = isoTimes.length; i < l; i++) {
if (isoTimes[i][1].exec(string)) {
- config._f += isoTimes[i][0];
+ // match[6] should be 'T' or space
+ config._f += (match[6] || ' ') + isoTimes[i][0];
break;
}
}