From 35a4052aba3211a95a64391c06b28f533d337d4e Mon Sep 17 00:00:00 2001 From: Keith Wood Date: Mon, 22 Jun 2009 02:08:19 +0000 Subject: [PATCH] Datepicker: Fixed #4536 Datepicker maxDate doesn't take into account column layout --- ui/ui.datepicker.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js index f3f00acb3..702d5ee8e 100644 --- a/ui/ui.datepicker.js +++ b/ui/ui.datepicker.js @@ -1296,7 +1296,7 @@ $.extend(Datepicker.prototype, { } if (maxDate) { var maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(), - maxDate.getMonth() - numMonths[1] + 1, maxDate.getDate())); + maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate())); maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw); while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) { drawMonth--; @@ -1554,8 +1554,8 @@ $.extend(Datepicker.prototype, { /* Determines if we should allow a "next/prev" month display change. */ _canAdjustMonth: function(inst, offset, curYear, curMonth) { var numMonths = this._getNumberOfMonths(inst); - var date = this._daylightSavingAdjust(new Date( - curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1)); + var date = this._daylightSavingAdjust(new Date(curYear, + curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1)); if (offset < 0) date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth())); return this._isInRange(inst, date); -- 2.39.5