From: Tim Wood <washwithcare@gmail.com>
Date: Mon, 20 Feb 2012 19:03:42 +0000 (-0800)
Subject: Making a default format for moment.fn.format
X-Git-Tag: 1.5.0~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84daf4cdd772d754b4cb7d6bc4ad743a043fef36;p=thirdparty%2Fmoment.git

Making a default format for moment.fn.format

#121 Default format is 'YYYY-MM-DDTHH:mm:ssZ'
---

diff --git a/moment.js b/moment.js
index 4524e2400..ce3e0d913 100644
--- a/moment.js
+++ b/moment.js
@@ -18,6 +18,7 @@
         timezoneRegex = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g,
         tokenCharacters = /(\\)?(MM?M?M?|dd?d?d|DD?D?D?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|ZZ?|T)/g,
         inputCharacters = /(\\)?([0-9]+|([a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+|([\+\-]\d\d:?\d\d))/gi,
+        isoFormat = 'YYYY-MM-DDTHH:mm:ssZ',
         timezoneParseRegex = /([\+\-]|\d\d)/gi,
         VERSION = "1.4.0",
         shortcuts = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|');
@@ -385,6 +386,9 @@
     // version number
     moment.version = VERSION;
 
+    // default format
+    moment.defaultFormat = isoFormat;
+
     // language switching and caching
     moment.lang = function (key, values) {
         var i,
@@ -514,7 +518,8 @@
         },
 
         format : function (inputString) {
-            return formatDate(this._d, inputString);
+            return inputString ? formatDate(this._d, inputString) :
+                formatDate(this._d, moment.defaultFormat);
         },
 
         add : function (input, val) {
diff --git a/test/moment/format.js b/test/moment/format.js
index 1b656dc87..1459a2ebf 100644
--- a/test/moment/format.js
+++ b/test/moment/format.js
@@ -81,5 +81,12 @@ exports.format = {
         test.ok(moment().zone() % 30 === 0, 'moment.fn.zone should be a multiple of 30 (was ' + moment().zone() + ')');
         test.equal(moment().zone(), new Date().getTimezoneOffset(), 'zone should equal getTimezoneOffset');
         test.done();
+    },
+
+    "default format" : function(test) {
+        test.expect(1);
+        var isoRegex = /\d{4}.\d\d.\d\dT\d\d.\d\d.\d\d[\+\-]\d\d:\d\d/;
+        test.ok(isoRegex.exec(moment().format()), "default format (" + moment().format() + ") should match ISO");
+        test.done();
     }
 };