From 323399c7bfc13c81dbaf780bd11615f04c288ab1 Mon Sep 17 00:00:00 2001 From: Keith Wood Date: Wed, 23 Jul 2008 10:35:33 +0000 Subject: Fixed 3105 First week in November day repeat Fixed 3088 Repeating date in October 2008 --- ui/ui.datepicker.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js index b0564cb94..59bd9492a 100644 --- a/ui/ui.datepicker.js +++ b/ui/ui.datepicker.js @@ -1328,7 +1328,9 @@ $.extend(Datepicker.prototype, { if (drawYear == inst.selectedYear && drawMonth == inst.selectedMonth) inst.selectedDay = Math.min(inst.selectedDay, daysInMonth); var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7; - var printDate = new Date(drawYear, drawMonth, 1 - leadDays); + var tzDate = new Date(drawYear, drawMonth, 1 - leadDays); + var utcDate = new Date(drawYear, drawMonth, 1 - leadDays); + var printDate = utcDate; var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows html += '' + @@ -1366,7 +1368,9 @@ $.extend(Datepicker.prototype, { inst.id + '\',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions (otherMonth ? (showOtherMonths ? printDate.getDate() : ' ') : // display for other months (unselectable ? printDate.getDate() : '' + printDate.getDate() + '')) + ''; // display for this month - printDate.setUTCDate(printDate.getUTCDate() + 1); + tzDate.setDate(tzDate.getDate() + 1); + utcDate.setUTCDate(utcDate.getUTCDate() + 1); + printDate = (tzDate > utcDate ? tzDate : utcDate); } html += ''; } -- cgit v1.2.3