Changeset 12198

Timestamp:

01/29/08 11:20:29 (12 months ago)

Author:

peller

Message:

build the Date object at the end, not as we go along. The setters on Date seem to have a bunch of issues. Calling the Date constructor once is more reliable and probably more performant. Also, use 1970 as the default year. Fixes #5716, #5680

Files:

• dojo/trunk/date/locale.js (modified) (8 diffs)

dojo/trunk/date/locale.js

@@ -292 +292 @@
 
         var widthList = ['abbr', 'wide', 'narrow'];
-        //1972 is a leap year.  We want to avoid Feb 29 rolling over into Mar 1,
-        //in the cases where the year is parsed after the month and day.
-        var result = new Date(1972, 0);
+        var result = [1970,0,1,0,0,0,0]; // will get converted to a Date at the end
         var expected = {};
         var amPm = "";
@@ -305 +303 @@
                                 if(l != 2 && options.strict){
                                         //interpret year literally, so '5' would be 5 A.D.
-                                        result.setFullYear(v);
+                                        result[0] = v;
                                         expected.year = v;
                                 }else{
@@ -314 +312 @@
                                                 var year = '' + new Date().getFullYear();
                                                 var century = year.substring(0, 2) * 100;
-                                                var yearPart = Number(year.substring(2, 4));
-                                                var cutoff = Math.min(yearPart + 20, 99);
+                                                var cutoff = Math.min(Number(year.substring(2, 4)) + 20, 99);
                                                 var num = (v < cutoff) ? century + v : century - 100 + v;
-                                                result.setFullYear(num);
+                                                result[0] = num;
                                                 expected.year = num;
                                         }else{
@@ -326 +323 @@
                                                 //interpret literally, so '150' would be 150 A.D.
                                                 //also tolerate '1950', if 'yyyy' input passed to 'yy' format
-                                                result.setFullYear(v);
+                                                result[0] = v;
                                                 expected.year = v;
                                         }
@@ -348 +345 @@
                                         v--;
                                 }
-                                result.setMonth(v);
+                                result[1] = v;
                                 expected.month = v;
                                 break;
@@ -371 +368 @@
                                 break;
                         case 'd':
-                                result.setDate(v);
+                                result[2] = v;
                                 expected.date = v;
                                 break;
                         case 'D':
-                                //FIXME: need to defer this until after the year is set for leap-year?
-                                result.setMonth(0);
-                                result.setDate(v);
+                                result[1] = 0;
+                                result[2] = v;
                                 break;
                         case 'a': //am/pm
@@ -410 +406 @@
                                 //in the 12-hour case, adjusting for am/pm requires the 'a' part
                                 //which could come before or after the hour, so we will adjust later
-                                result.setHours(v);
+                                result[3] =v;
                                 break;
                         case 'm': //minutes
-                                result.setMinutes(v);
+                                result[4] = v;
                                 break;
                         case 's': //seconds
-                                result.setSeconds(v);
+                                result[5] = v;
                                 break;
                         case 'S': //milliseconds
-                                result.setMilliseconds(v);
+                                result[6] = v;
 //                              break;
 //                      case 'w':
@@ -430 +426 @@
         });
 
-        //validate parse date fields versus input date fields
-        if(!valid ||
-                (expected.year && result.getFullYear() != expected.year) ||
-                (expected.month && result.getMonth() != expected.month) ||
-                (expected.date && result.getDate() != expected.date)){
-                return null;
-        }
-
-        var hours = result.getHours();
+        var hours = result[3];
         if(amPm === 'p' && hours < 12){
-                result.setHours(hours + 12); //e.g., 3pm -> 15
+                result[3] = hours + 12; //e.g., 3pm -> 15
         }else if(amPm === 'a' && hours == 12){
-                result.setHours(0); //12am -> 0
+                result[3] = 0; //12am -> 0
         }
 
         //TODO: implement a getWeekday() method in order to test 
         //validity of input strings containing 'EEE' or 'EEEE'...
-        return result; // Date
+
+        var dateObject = new Date(result[0], result[1], result[2], result[3], result[4], result[5], result[6]); // Date
+
+        // Do some bounds checking.  The Date() constructor normalizes things like April 32nd...
+        //TODO: why isn't this done for times as well?
+        if(!valid ||
+                (expected.year && dateObject.getFullYear() != result[0]) ||
+                (expected.month && dateObject.getMonth() != result[1]) ||
+                (expected.date && dateObject.getDate() != result[2])){
+                return null;
+        }
+
+        return dateObject; // Date
 };