From: Ian Remmel Date: Mon, 9 Sep 2013 07:45:31 +0000 (-1000) Subject: converted to spaces X-Git-Tag: 2.3.0~41^2~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c1b86fda76c7cbf7da9cf9c58dc9dfa1b508a6;p=thirdparty%2Fmoment.git converted to spaces --- diff --git a/moment.js b/moment.js index 179ba82f4..21863fbc7 100644 --- a/moment.js +++ b/moment.js @@ -23,7 +23,7 @@ aspNetJsonRegex = /^\/?Date\((\-?\d+)/i, aspNetTimeSpanJsonRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/, - twentyFourHourTimeRegex = /(\d{2})\:(\d{2})/, + twentyFourHourTimeRegex = /(\d{2})\:(\d{2})/, // 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 +1127,7 @@ isNumber = (typeof input === 'number'), duration = (isDuration ? input._input : (isNumber ? {} : input)), matched = aspNetTimeSpanJsonRegex.exec(input), - twentyFourHourMatched = twentyFourHourTimeRegex.exec(input), + twentyFourHourMatched = twentyFourHourTimeRegex.exec(input), sign, ret; @@ -1147,15 +1147,15 @@ 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 - }; + } else if (twentyFourHourMatched) { + duration = { + y: 0, + d: 0, + h: ~~twentyFourHourMatched[1], + m: ~~twentyFourHourMatched[2], + s: 0, + ms: 0 + }; } ret = new Duration(duration); diff --git a/test/moment/duration.js b/test/moment/duration.js index 434c4faa4..c3ead0656 100644 --- a/test/moment/duration.js +++ b/test/moment/duration.js @@ -140,25 +140,25 @@ exports.duration = { }, "instantiation from 24-hour time zero" : function(test) { - test.expect(6); - test.equal(moment.duration("00:00").years(), 0, "0 years"); - test.equal(moment.duration("00:00").days(), 0, "0 days"); - test.equal(moment.duration("00:00").hours(), 0, "0 hours"); - test.equal(moment.duration("00:00").minutes(), 0, "0 minutes"); - test.equal(moment.duration("00:00").seconds(), 0, "0 seconds"); - test.equal(moment.duration("00:00").milliseconds(), 0, "0 milliseconds"); - test.done(); + test.expect(6); + test.equal(moment.duration("00:00").years(), 0, "0 years"); + test.equal(moment.duration("00:00").days(), 0, "0 days"); + test.equal(moment.duration("00:00").hours(), 0, "0 hours"); + test.equal(moment.duration("00:00").minutes(), 0, "0 minutes"); + test.equal(moment.duration("00:00").seconds(), 0, "0 seconds"); + test.equal(moment.duration("00:00").milliseconds(), 0, "0 milliseconds"); + test.done(); }, "instantiation from 24-hour time" : function(test) { - test.expect(6); - test.equal(moment.duration("13:45").years(), 0, "0 years"); - test.equal(moment.duration("13:45").days(), 0, "0 days"); - test.equal(moment.duration("13:45").hours(), 13, "13 hours"); - test.equal(moment.duration("13:45").minutes(), 45, "45 minutes"); - test.equal(moment.duration("13:45").seconds(), 0, "0 seconds"); - test.equal(moment.duration("13:45").milliseconds(), 0, "0 milliseconds"); - test.done(); + test.expect(6); + test.equal(moment.duration("13:45").years(), 0, "0 years"); + test.equal(moment.duration("13:45").days(), 0, "0 days"); + test.equal(moment.duration("13:45").hours(), 13, "13 hours"); + test.equal(moment.duration("13:45").minutes(), 45, "45 minutes"); + test.equal(moment.duration("13:45").seconds(), 0, "0 seconds"); + test.equal(moment.duration("13:45").milliseconds(), 0, "0 milliseconds"); + test.done(); }, "instatiation from serialized C# TimeSpan zero" : function (test) {