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,
isNumber = (typeof input === 'number'),
duration = (isDuration ? input._input : (isNumber ? {} : input)),
matched = aspNetTimeSpanJsonRegex.exec(input),
- twentyFourHourMatched = twentyFourHourTimeRegex.exec(input),
+ twentyFourHourMatched = twentyFourHourTimeRegex.exec(input),
sign,
ret;
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);
},
"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) {