';
}
@@ -1555,7 +1565,7 @@ $.extend(Datepicker.prototype, {
monthHtml += '';
}
if (!showMonthAfterYear)
- html += monthHtml + (changeMonth && changeYear ? '' : ' ');
+ html += monthHtml + (secondary || changeMonth || changeYear ? ' ' : '');
// year selection
if (secondary || !changeYear)
html += drawYear;
@@ -1589,7 +1599,7 @@ $.extend(Datepicker.prototype, {
html += '';
}
if (showMonthAfterYear)
- html += (changeMonth && changeYear ? '' : ' ') + monthHtml;
+ html += (secondary || changeMonth || changeYear ? ' ' : '') + monthHtml;
html += '
'; // Close datepicker_header
return html;
},
@@ -1608,7 +1618,7 @@ $.extend(Datepicker.prototype, {
var month = inst.drawMonth + (period == 'M' ? offset : 0);
var day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) +
(period == 'D' ? offset : 0);
- var date = new Date(year, month, day);
+ var date = this._daylightSavingAdjust(new Date(year, month, day));
// ensure it is within the bounds set
var minDate = this._getMinMaxDate(inst, 'min', true);
var maxDate = this._getMinMaxDate(inst, 'max');
@@ -1638,12 +1648,6 @@ $.extend(Datepicker.prototype, {
/* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
_getMinMaxDate: function(inst, minMax, checkRange) {
var date = this._determineDate(this._get(inst, minMax + 'Date'), null);
- if (date) {
- date.setHours(0);
- date.setMinutes(0);
- date.setSeconds(0);
- date.setMilliseconds(0);
- }
return (!checkRange || !inst.rangeStart ? date :
(!date || inst.rangeStart > date ? inst.rangeStart : date));
},
@@ -1661,7 +1665,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 = new Date(curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1);
+ var date = this._daylightSavingAdjust(new Date(
+ curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1));
if (offset < 0)
date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
return this._isInRange(inst, date);
@@ -1670,8 +1675,8 @@ $.extend(Datepicker.prototype, {
/* Is the given date in the accepted range? */
_isInRange: function(inst, date) {
// during range selection, use minimum of selected date and range start
- var newMinDate = (!inst.rangeStart ? null :
- new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay));
+ var newMinDate = (!inst.rangeStart ? null : this._daylightSavingAdjust(
+ new Date(inst.selectedYear, inst.selectedMonth, inst.selectedDay)));
newMinDate = (newMinDate && inst.rangeStart < newMinDate ? inst.rangeStart : newMinDate);
var minDate = newMinDate || this._getMinMaxDate(inst, 'min');
var maxDate = this._getMinMaxDate(inst, 'max');
@@ -1695,8 +1700,9 @@ $.extend(Datepicker.prototype, {
inst.currentMonth = inst.selectedMonth;
inst.currentYear = inst.selectedYear;
}
- var date = (day ? (typeof day == 'object' ? day : new Date(year, month, day)) :
- new Date(inst.currentYear, inst.currentMonth, inst.currentDay));
+ var date = (day ? (typeof day == 'object' ? day :
+ this._daylightSavingAdjust(new Date(year, month, day))) :
+ this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
return this.formatDate(this._get(inst, 'dateFormat'), date, this._getFormatConfig(inst));
}
});