Ticket #5911: patch5911.diff

dojo/date/stamp.js

@@ -25 +25 @@
         //              input may return null.  Arguments which are out of bounds will be handled
         //              by the Date constructor (e.g. January 32nd typically gets resolved to February 1st)
         //
-        //      formattedString:
+        //      formattedString:
         //              A string such as 2005-06-30T08:05:00-07:00 or 2005-06-30 or T08:05:00
+        //              
+        //              >>> var t = dojo.date.stamp.fromISOString("2008-01-20T21:45:03") // Note the "T" before the time!
+        //              >>> String(t).match(/Sun Jan 20 2008 21:45:03/) // Do only test for the beginning of the string, the end contains the timezone and that might differ on each test system
+        //              ["Sun Jan 20 2008 21:45:03"]
         //
+        //              >>> dojo.date.stamp.fromISOString("2008-01-20 21:45:03") // Note the space before the time!
+        //              >>> String(t).match(/Sun Jan 20 2008 21:45:03/)
+        //              ["Sun Jan 20 2008 21:45:03"]
+        //
         //      defaultTime:
         //              Used for defaults for fields omitted in the formattedString.
         //              Uses 1970-01-01T00:00:00.0Z by default.
@@ -35 +43 @@
         if(!dojo.date.stamp._isoRegExp){
                 dojo.date.stamp._isoRegExp =
 //TODO: could be more restrictive and check for 00-59, etc.
-                        /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(.\d+)?)?((?:[+-](\d{2}):(\d{2}))|Z)?)?$/;
+                        /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:[ T](\d{2}):(\d{2})(?::(\d{2})(.\d+)?)?((?:[+-](\d{2}):(\d{2}))|Z)?)?$/;
         }
 
         var match = dojo.date.stamp._isoRegExp.exec(formattedString);
@@ -100 +108 @@
         var getter = options.zulu ? "getUTC" : "get";
         var date = "";
         if(options.selector != "time"){
-                date = [dateObject[getter+"FullYear"](), _(dateObject[getter+"Month"]()+1), _(dateObject[getter+"Date"]())].join('-');
+                var year = dateObject[getter+"FullYear"]();
+                // For a year 100>999 getFullYear() returns a three digit number!
+                year = year<1000 ? "0"+year : year;
+                date = [year, _(dateObject[getter+"Month"]()+1), _(dateObject[getter+"Date"]())].join('-');
         }
         formattedDate.push(date);
         if(options.selector != "date"){

dojo/tests/date/stamp.js

@@ -14 +14 @@
         t.is(5,date.getMinutes());
         t.is(0,date.getSeconds());
 
+        var rfc  = "2005-06-29 08:05:00";
+        var date = dojo.date.stamp.fromISOString(rfc);
+        t.is(2005,date.getFullYear());
+        t.is(5,date.getMonth());
+        t.is(29,date.getDate());
+        t.is(8,date.getHours());
+        t.is(5,date.getMinutes());
+        t.is(0,date.getSeconds());
+
         rfc  = "2004-02-29";
         date = dojo.date.stamp.fromISOString(rfc);
         t.is(2004,date.getFullYear());
@@ -45 +54 @@
         //truncate for comparison
         t.is("0101-01",rfc.substring(0,7));
 
+        // Make sure years between 100 and 999 are represented by four digits
+        // see http://trac.dojotoolkit.org/ticket/5911
+        date = new Date(100,1,2);
+        rfc = dojo.date.stamp.toISOString(date);
+        t.is("0100-",rfc.substring(0,5));
+        date = new Date(999,1,2);
+        rfc = dojo.date.stamp.toISOString(date);
+        t.is("0999-",rfc.substring(0,5));
+
         rfc  = "0101-01-01";
         date = dojo.date.stamp.fromISOString(rfc);
         t.is(101,date.getFullYear());