From c1470492bd902738a54b994ee29ff4eecedae855 Mon Sep 17 00:00:00 2001
From: Jay Merrifield <fracmak@gmail.com>
Date: Sat, 14 May 2011 18:20:06 -0400
Subject: [PATCH] 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)

---
 tests/unit/datepicker/datepicker_tickets.js | 5 +++++
 ui/jquery.ui.datepicker.js                  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/unit/datepicker/datepicker_tickets.js b/tests/unit/datepicker/datepicker_tickets.js
index d00dc912cde..841e404057a 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 93d468c3635..e6ca5d984af 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);