]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
fixing default format 1097/head
authorIsaac Cambron <isaac@isaaccambron.com>
Tue, 17 Sep 2013 04:04:47 +0000 (00:04 -0400)
committerIsaac Cambron <isaac@isaaccambron.com>
Tue, 17 Sep 2013 04:04:47 +0000 (00:04 -0400)
moment.js
test/moment/listers.js

index e4e0103ea11ecff27502db644215228dc846a311..a2cc2465ac3fcf1e36cfa1a7bd8085ea54498542 100644 (file)
--- a/moment.js
+++ b/moment.js
         }
 
         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);
index 4b6bf12bc320d926f47677781677fe24c054503d..7f9021b4a06b40da9844a1ad5e9467f716464246 100644 (file)
@@ -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();
     }