diff options
| author | Jay Merrifield <fracmak@gmail.com> | 2011-05-14 18:20:06 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-05-16 07:54:38 -0400 |
| commit | c1470492bd902738a54b994ee29ff4eecedae855 (patch) | |
| tree | 4403697ad18300aadfefa14ab68a480289e46d65 | |
| parent | 18669056957c49d5b72693a1d61d47f041d6e5ff (diff) | |
| download | jquery-ui-c1470492bd902738a54b994ee29ff4eecedae855.tar.gz jquery-ui-c1470492bd902738a54b994ee29ff4eecedae855.zip | |
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 41205cef4b23749592c832605452af6575970623)
| -rw-r--r-- | tests/unit/datepicker/datepicker_tickets.js | 5 | ||||
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js index d00dc912c..841e40405 100644 --- a/tests/unit/datepicker/datepicker_tickets.js +++ b/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); diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 93d468c36..e6ca5d984 100644 --- a/ui/jquery.ui.datepicker.js +++ b/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); |