From: Tim Wood Date: Thu, 8 Nov 2012 22:52:14 +0000 (-0800) Subject: Adding plural weeks/isoWeeks methods that mirror their singular form X-Git-Tag: 2.0.0~35^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41d724d0d13d5dc65fe6fa9f5daccb5a4ae2d4c;p=thirdparty%2Fmoment.git Adding plural weeks/isoWeeks methods that mirror their singular form --- diff --git a/moment.js b/moment.js index 8dc2b8a9a..7a4ba7469 100644 --- a/moment.js +++ b/moment.js @@ -1245,8 +1245,10 @@ // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') makeGetterAndSetter('year', 'FullYear'); - // add days plural method + // add plural methods moment.fn.days = moment.fn.day; + moment.fn.weeks = moment.fn.week; + moment.fn.isoWeeks = moment.fn.isoWeek; /************************************ Duration Prototype diff --git a/test/moment/weeks.js b/test/moment/weeks.js index d262a5e6e..c2f286d9e 100644 --- a/test/moment/weeks.js +++ b/test/moment/weeks.js @@ -124,6 +124,30 @@ exports.utc = { test.equal(moment([2012, 0, 9]).format('W WW Wo'), '2 02 2nd' , "Jan 9 2012 should be iso week 2"); test.equal(moment([2012, 0, 15]).format('W WW Wo'), '2 02 2nd' , "Jan 15 2012 should be iso week 2"); + test.done(); + }, + + "weeks plural year starting sunday" : function(test) { + test.expect(5); + + test.equal(moment([2012, 0, 1]).weeks(), 1, "Jan 1 2012 should be week 1"); + test.equal(moment([2012, 0, 7]).weeks(), 1, "Jan 7 2012 should be week 1"); + test.equal(moment([2012, 0, 8]).weeks(), 2, "Jan 8 2012 should be week 2"); + test.equal(moment([2012, 0, 14]).weeks(), 2, "Jan 14 2012 should be week 2"); + test.equal(moment([2012, 0, 15]).weeks(), 3, "Jan 15 2012 should be week 3"); + + test.done(); + }, + + "iso weeks plural year starting sunday" : function(test) { + test.expect(5); + + test.equal(moment([2012, 0, 1]).isoWeeks(), 52, "Jan 1 2012 should be iso week 52"); + test.equal(moment([2012, 0, 2]).isoWeeks(), 1, "Jan 2 2012 should be iso week 1"); + test.equal(moment([2012, 0, 8]).isoWeeks(), 1, "Jan 8 2012 should be iso week 1"); + test.equal(moment([2012, 0, 9]).isoWeeks(), 2, "Jan 9 2012 should be iso week 2"); + test.equal(moment([2012, 0, 15]).isoWeeks(), 2, "Jan 15 2012 should be iso week 2"); + test.done(); } };