Changeset 12199

Timestamp:

01/29/08 11:26:07 (12 months ago)

Author:

peller

Message:

reduce the bounds checking code. Refs #5716

Files:

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

dojo/trunk/date/locale.js

@@ -293 +293 @@
         var widthList = ['abbr', 'wide', 'narrow'];
         var result = [1970,0,1,0,0,0,0]; // will get converted to a Date at the end
-        var expected = {};
         var amPm = "";
         var valid = dojo.every(match, function(v, i){
@@ -304 +303 @@
                                         //interpret year literally, so '5' would be 5 A.D.
                                         result[0] = v;
-                                        expected.year = v;
                                 }else{
                                         if(v<100){
@@ -315 +313 @@
                                                 var num = (v < cutoff) ? century + v : century - 100 + v;
                                                 result[0] = num;
-                                                expected.year = num;
                                         }else{
                                                 //we expected 2 digits and got more...
@@ -324 +321 @@
                                                 //also tolerate '1950', if 'yyyy' input passed to 'yy' format
                                                 result[0] = v;
-                                                expected.year = v;
                                         }
                                 }
@@ -346 +342 @@
                                 }
                                 result[1] = v;
-                                expected.month = v;
                                 break;
                         case 'E':
@@ -369 +364 @@
                         case 'd':
                                 result[2] = v;
-                                expected.date = v;
                                 break;
                         case 'D':
@@ -440 +434 @@
         // Do some bounds checking.  The Date() constructor normalizes things like April 32nd...
         //TODO: why isn't this done for times as well?
+        var allTokens = tokens.join("");
         if(!valid ||
-                (expected.year && dateObject.getFullYear() != result[0]) ||
-                (expected.month && dateObject.getMonth() != result[1]) ||
-                (expected.date && dateObject.getDate() != result[2])){
+                (allTokens.indexOf('y') != -1 && dateObject.getFullYear() != result[0]) ||
+                (allTokens.indexOf('M') != -1 && dateObject.getMonth() != result[1]) ||
+                (allTokens.indexOf('d') != -1 && dateObject.getDate() != result[2])){
                 return null;
         }