Skip to content
Permalink
Browse files

Datepicker: Fixed #4536 Datepicker maxDate doesn't take into account …

…column layout
  • Loading branch information
Keith Wood
Keith Wood committed Jun 22, 2009
1 parent 3b5c91f commit 35a4052aba3211a95a64391c06b28f533d337d4e
Showing with 3 additions and 3 deletions.
  1. +3 −3 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);

0 comments on commit 35a4052

Please sign in to comment.
You can’t perform that action at this time.