Permalink
Browse files

Datepicker: Made the day of year calculator be more accurate. Fixes #…

…6827 - Datepicker: Incorrect value for "oo" during Daylight Saving Time.

(cherry picked from commit 41205ce)
  • Loading branch information...
1 parent 1866905 commit c1470492bd902738a54b994ee29ff4eecedae855 @fracmak fracmak committed with scottgonzalez May 14, 2011
Showing with 6 additions and 1 deletion.
  1. +5 −0 tests/unit/datepicker/datepicker_tickets.js
  2. +1 −1 ui/jquery.ui.datepicker.js
View
5 tests/unit/datepicker/datepicker_tickets.js
@@ -29,4 +29,9 @@ test('beforeShowDay-getDate', function() {
inp.datepicker('hide');
});
+test('Ticket 6827: formatDate day of year calculation is wrong during day lights savings time', function(){
+ var time = $.datepicker.formatDate("oo", new Date("2010/03/30 12:00:00 CDT"));
+ equals(time, "089");
+});
+
})(jQuery);
View
2 ui/jquery.ui.datepicker.js
@@ -1181,7 +1181,7 @@ $.extend(Datepicker.prototype, {
break;
case 'o':
output += formatNumber('o',
- (date.getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000, 3);
+ Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
break;
case 'm':
output += formatNumber('m', date.getMonth() + 1, 2);

0 comments on commit c147049

Please sign in to comment.