Changeset 8669

Timestamp:

05/21/07 06:37:30 (20 months ago)

Author:

pottedmeat

Message:

fixes #3079. Fix getTimezone, weekdays, Jan 1 calculation, and support overrides

Files:

• dojox/trunk/date/php.js (modified) (9 diffs)

dojox/trunk/date/php.js

@@ -2 +2 @@
 dojo.require("dojo.date");
 
-dojox.date.php.format = function(/*Date*/ date, /*String*/ format){
+dojox.date.php.format = function(/*Date*/ date, /*String*/ format, /*Object?*/ overrides){
         // summary: Get a formatted string for a given date object
         var df = new dojox.date.php.DateFormat(date);
-        return df.format(format);       
+        return df.format(format, overrides);    
 }
 
-dojox.date.php.DateFormat = function(date){
+dojox.date.php.DateFormat = function(/*Date*/ date){
         this.date = date;
 }
@@ -18 +18 @@
         monthdays: [31,28,31,30,31,30,31,31,30,31,30,31],
 
-        format: function(/*String*/ format){
+        format: function(/*String*/ format, /*Object?*/ overrides){
                 // summary: Format the internal date object
                 var parts = [];
                 for(var i = 0; i < format.length; i++){
                         var chr = format.charAt(i);
-                        if(typeof this[chr] == "function"){
+                        if(overrides && typeof overrides[chr] == "function"){
+                                parts.push(overrides[chr].call(this));
+                        }else if(typeof this[chr] == "function"){
                                 parts.push(this[chr]());
                         }else{
@@ -42 +44 @@
         D: function(){
                 // summary: A textual representation of a day, three letters
-                return weekdays_3[this.date.getDay()];
+                return this.weekdays_3[this.date.getDay()];
         },
 
@@ -52 +54 @@
         l: function(){
                 // summary: A full textual representation of the day of the week
-                return weekdays[this.date.getDay()];
+                return this.weekdays[this.date.getDay()];
         },
         
@@ -79 +81 @@
         z: function(){
                 // summary: The day of the year (starting from 0)
-                var millis = this.date.getTime() - new Date(this.date.getYear(), 1, 1).getTime();
+                var millis = this.date.getTime() - new Date(this.date.getFullYear(), 0, 1).getTime();
                 return Math.floor(millis/86400000) + "";
         },
@@ -88 +90 @@
                 // summary: ISO-8601 week number of year, weeks starting on Monday (added in PHP 4.1.0)
                 var week;
-                var jan1_w = new Date(this.date.getYear(), 1, 1).getDay() + 1;
+                var jan1_w = new Date(this.date.getFullYear(), 0, 1).getDay() + 1;
                 var w = this.date.getDay() + 1;
                 var z = parseInt(this.z());
 
                 if(z <= (8 - jan1_w) && jan1_w > 4){
-                        if(jan1_w == 5 || (jan1_w == 6 && Boolean(this.L()))){
+                        var last_year = new Date(this.date.getFullYear() - 1, this.date.getMonth(), this.date.getDate());
+                        if(jan1_w == 5 || (jan1_w == 6 && dojo.date.isLeapYear(last_year))){
                                 week = 53;
                         }else{
@@ -109 +112 @@
                         }else{
                                 var j = z + (7 - w) + (jan1_w - 1);
-                                week = j / 7;
+                                week = Math.ceil(j / 7);
                                 if(jan1_w > 4){
                                         --week;
@@ -242 +245 @@
         O: function(){
                 // summary: Difference to Greenwich time (GMT) in hours
-                var off = Math.abs(this.date.getTimeZoneOffset());
+                var off = Math.abs(this.date.getTimezoneOffset());
                 var hours = Math.floor(off / 60) + "";
                 var mins = (off % 60) + "";
@@ -267 +270 @@
                 //              Timezone offset in seconds. The offset for timezones west of UTC is always negative,
                 //              and for those east of UTC is always positive.
-                return this.date.getTimeZoneOffset() * -60;
+                return this.date.getTimezoneOffset() * -60;
         },