From: Isaac Cambron Date: Tue, 17 Sep 2013 04:04:47 +0000 (-0400) Subject: fixing default format X-Git-Tag: 2.3.0~27^2 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1097%2Fhead;p=thirdparty%2Fmoment.git fixing default format --- diff --git a/moment.js b/moment.js index e4e0103ea..a2cc2465a 100644 --- a/moment.js +++ b/moment.js @@ -389,15 +389,19 @@ } moment[field] = function (format, index) { - var i, + var i, getter, method = moment.fn._lang[field], - results = [], - getter = function (i) { - var m = moment().utc().set(setter, i); - return method.call(moment.fn._lang, m, format || ''); - }; + results = []; - index = (typeof format === 'number') ? format : index; + if (typeof format === 'number') { + index = format; + format = undefined; + } + + getter = function (i) { + var m = moment().utc().set(setter, i); + return method.call(moment.fn._lang, m, format || ''); + }; if (index) { return getter(index); diff --git a/test/moment/listers.js b/test/moment/listers.js index 4b6bf12bc..7f9021b4a 100644 --- a/test/moment/listers.js +++ b/test/moment/listers.js @@ -74,13 +74,14 @@ exports.listers = { } }); - test.expect(5); + test.expect(6); test.deepEqual(moment.monthsShort(), monthsShort); test.deepEqual(moment.monthsShort('MMM'), monthsShort); test.deepEqual(moment.monthsShort('-MMM-'), monthsShortWeird); test.deepEqual(moment.monthsShort('MMM', 2), 'three'); test.deepEqual(moment.monthsShort('-MMM-', 2), 'threesy'); + test.deepEqual(moment.monthsShort(2), 'three'); test.done(); }