From: Iskren Chernev Date: Sun, 26 Jul 2015 03:47:30 +0000 (-0700) Subject: Implement suggested improvements X-Git-Tag: 2.10.5~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2e4640022abb83019643b1cdf2d39072d4fb449;p=thirdparty%2Fmoment.git Implement suggested improvements --- diff --git a/src/lib/units/millisecond.js b/src/lib/units/millisecond.js index 1f9a9bfe4..134d88ee9 100644 --- a/src/lib/units/millisecond.js +++ b/src/lib/units/millisecond.js @@ -46,18 +46,19 @@ addUnitAlias('millisecond', 'ms'); addRegexToken('S', match1to3, match1); addRegexToken('SS', match1to3, match2); addRegexToken('SSS', match1to3, match3); -addRegexToken('SSSS', matchUnsigned); -addRegexToken('SSSSS', matchUnsigned); -addRegexToken('SSSSSS', matchUnsigned); -addRegexToken('SSSSSSS', matchUnsigned); -addRegexToken('SSSSSSSS', matchUnsigned); -addRegexToken('SSSSSSSSS', matchUnsigned); -addParseToken( - 'S SS SSS SSSS SSSSS SSSSSS SSSSSSS SSSSSSSS SSSSSSSSS'.split(' '), - function (input, array) { + +var token; +for (token = 'SSSS'; token.length <= 9; token += 'S') { + addRegexToken(token, matchUnsigned); +} + +function parseMs(input, array) { array[MILLISECOND] = toInt(('0.' + input) * 1000); -}); +} +for (token = 'S'; token.length <= 9; token += 'S') { + addParseToken(token, parseMs); +} // MOMENTS export var getSetMillisecond = makeGetSet('Milliseconds', false); diff --git a/src/test/moment/format.js b/src/test/moment/format.js index a31c557fe..016f6d17f 100644 --- a/src/test/moment/format.js +++ b/src/test/moment/format.js @@ -359,7 +359,7 @@ test('full expanded format is returned from abbreviated formats', function (asse }); test('milliseconds', function (assert) { - var m = moment('123','SSS'); + var m = moment('123', 'SSS'); assert.equal(m.format('S'), '1'); assert.equal(m.format('SS'), '12');