Skip to content

Datepicker: allows the correct use of 0-99 years, #1262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BrunoRB wants to merge 2 commits into from
Closed

Datepicker: allows the correct use of 0-99 years, #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d026ca
Datepicker: allows the correct use of 0-99 years,
BrunoRB Jun 8, 2014
a9dd6c1
fix jshint errors from the last commit
BrunoRB Jun 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions tests/unit/datepicker/datepicker_options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,4 +1120,48 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
inp.datepicker( "destroy" );
});

test("Ticket #7098: Broken handling of four digit years before year 100", function() {
expect(120);

var year = null,
someDate = null,
parsedHDate = null,
inp = TestHelpers.datepicker.init("#inp", {
changeMonth: true,
changeYear: true,
shortYearCutoff: 0,
yearRange: "0:2100"
});

for (year=0; year<100; year++) { // loop 100
parsedHDate = $.datepicker.parseDate("y-m-d", year + "-10-23", {shortYearCutoff: 0});
someDate = new Date(year, 2 - 1, 3);
someDate.setFullYear(year);
equal(
someDate.getFullYear(), parsedHDate.getFullYear(),
"parseDate return date obj with the correct year"
);
}

for (year=1; year<100; year+=10) { // loop 10
someDate = new Date(year, 2, 3);
someDate.setFullYear(year);
inp.datepicker("option", "defaultDate", someDate);
inp.datepicker("show");
$("td[data-handler='selectDay'] a").first().click();
inp.datepicker("show");
equal(
$(".ui-datepicker-year option:selected").val(),
someDate.getFullYear(),
"Selected year stays the same as the default"
);
inp.datepicker("hide");
ok(
inp.val().indexOf(someDate.getFullYear()) !== -1,
"inp val has the default/selected year"
);
inp.datepicker("setDate", null);
}
});

})(jQuery);
94 changes: 75 additions & 19 deletions ui/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ $.extend(Datepicker.prototype, {
_autoSize: function(inst) {
if (this._get(inst, "autoSize") && !inst.inline) {
var findMax, max, maxI, i,
date = new Date(2009, 12 - 1, 20), // Ensure double digits
date = this._getDateObjectWithFixedYear(2009, 12 - 1, 20), // Ensure double digits
dateFormat = this._get(inst, "dateFormat");

if (dateFormat.match(/[DM]/)) {
Expand Down Expand Up @@ -1113,6 +1113,7 @@ $.extend(Datepicker.prototype, {
shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
ignoreShortYearCutoff = (settings && settings.shortYearCutoff === 0),
dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
Expand Down Expand Up @@ -1236,7 +1237,7 @@ $.extend(Datepicker.prototype, {

if (year === -1) {
year = new Date().getFullYear();
} else if (year < 100) {
} else if (year < 100 && !ignoreShortYearCutoff) {
year += new Date().getFullYear() - new Date().getFullYear() % 100 +
(year <= shortYearCutoff ? 0 : -100);
}
Expand All @@ -1254,7 +1255,7 @@ $.extend(Datepicker.prototype, {
} while (true);
}

date = this._daylightSavingAdjust(new Date(year, month - 1, day));
date = this._daylightSavingAdjust(this._getDateObjectWithFixedYear(year, month - 1, day));
if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
throw "Invalid date"; // E.g. 31/02/00
}
Expand Down Expand Up @@ -1359,7 +1360,16 @@ $.extend(Datepicker.prototype, {
break;
case "o":
output += formatNumber("o",
Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
Math.round(
(
this._getDateObjectWithFixedYear(
date.getFullYear(), date.getMonth(), date.getDate()
).getTime() -
this._getDateObjectWithFixedYear(
date.getFullYear(), 0, 0
).getTime()
) / 86400000
), 3);
break;
case "m":
output += formatNumber("m", date.getMonth() + 1, 2);
Expand Down Expand Up @@ -1515,7 +1525,7 @@ $.extend(Datepicker.prototype, {
}
matches = pattern.exec(offset);
}
return new Date(year, month, day);
return $.datepicker._getDateObjectWithFixedYear(year, month, day);
},
newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
Expand Down Expand Up @@ -1619,7 +1629,10 @@ $.extend(Datepicker.prototype, {
printDate, dRow, tbody, daySettings, otherMonth, unselectable,
tempDate = new Date(),
today = this._daylightSavingAdjust(
new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
this._getDateObjectWithFixedYear(
tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate()
)
), // clear time
isRTL = this._get(inst, "isRTL"),
showButtonPanel = this._get(inst, "showButtonPanel"),
hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
Expand All @@ -1628,8 +1641,15 @@ $.extend(Datepicker.prototype, {
showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
stepMonths = this._get(inst, "stepMonths"),
isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
currentDate = this._daylightSavingAdjust(
(
!inst.currentDay ?
this._getDateObjectWithFixedYear(9999, 9, 9) :
this._getDateObjectWithFixedYear(
inst.currentYear, inst.currentMonth, inst.currentDay
)
)
),
minDate = this._getMinMaxDate(inst, "min"),
maxDate = this._getMinMaxDate(inst, "max"),
drawMonth = inst.drawMonth - showCurrentAtPos,
Expand All @@ -1643,7 +1663,11 @@ $.extend(Datepicker.prototype, {
maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
while (
this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(drawYear, drawMonth, 1)
) > maxDraw
) {
drawMonth--;
if (drawMonth < 0) {
drawMonth = 11;
Expand All @@ -1656,7 +1680,9 @@ $.extend(Datepicker.prototype, {

prevText = this._get(inst, "prevText");
prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(drawYear, drawMonth - stepMonths, 1)
),
this._getFormatConfig(inst)));

prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
Expand All @@ -1666,7 +1692,9 @@ $.extend(Datepicker.prototype, {

nextText = this._get(inst, "nextText");
nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(drawYear, drawMonth + stepMonths, 1)
),
this._getFormatConfig(inst)));

next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
Expand Down Expand Up @@ -1704,7 +1732,9 @@ $.extend(Datepicker.prototype, {
group = "";
this.maxRows = 4;
for (col = 0; col < numMonths[1]; col++) {
selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
selectedDate = this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(drawYear, drawMonth, inst.selectedDay)
);
cornerClass = " ui-corner-all";
calender = "";
if (isMultiMonth) {
Expand Down Expand Up @@ -1742,7 +1772,9 @@ $.extend(Datepicker.prototype, {
curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
this.maxRows = numRows;
printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
printDate = this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(drawYear, drawMonth, 1 - leadDays)
);
for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
calender += "<tr>";
tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
Expand Down Expand Up @@ -1870,7 +1902,9 @@ $.extend(Datepicker.prototype, {
var year = inst.drawYear + (period === "Y" ? offset : 0),
month = inst.drawMonth + (period === "M" ? offset : 0),
day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
date = this._restrictMinMax(
inst, this._daylightSavingAdjust(this._getDateObjectWithFixedYear(year, month, day))
);

inst.selectedDay = date.getDate();
inst.drawMonth = inst.selectedMonth = date.getMonth();
Expand Down Expand Up @@ -1910,12 +1944,16 @@ $.extend(Datepicker.prototype, {

/* Find the number of days in a given month. */
_getDaysInMonth: function(year, month) {
return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
return (
32 - this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(year, month, 32)
).getDate()
);
},

/* Find the day of the week of the first of a month. */
_getFirstDayOfMonth: function(year, month) {
return new Date(year, month, 1).getDay();
return this._getDateObjectWithFixedYear(year, month, 1).getDay();
},

/* Determines if we should allow a "next/prev" month display change. */
Expand Down Expand Up @@ -1975,9 +2013,27 @@ $.extend(Datepicker.prototype, {
inst.currentYear = inst.selectedYear;
}
var date = (day ? (typeof day === "object" ? day :
this._daylightSavingAdjust(new Date(year, month, day))) :
this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
this._daylightSavingAdjust(this._getDateObjectWithFixedYear(year, month, day))) :
this._daylightSavingAdjust(
this._getDateObjectWithFixedYear(
inst.currentYear, inst.currentMonth, inst.currentDay
)
)
);
return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
},

/**
* Create a date object with the correct year for 0 to 99 years
*
* @return Date - a new date object with the correct year for 0-99 years
*/
_getDateObjectWithFixedYear: function(year, month, day) {
var dateObject = new Date(year, month, day);
if (year >= 0 && year < 100) {
dateObject.setFullYear(year);
}
return dateObject;
}
});

Expand Down Expand Up @@ -2068,4 +2124,4 @@ $.datepicker.version = "@VERSION";

return $.datepicker;

}));
}));