library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Datepicker: Handle when yearRange is a year or a modifier. Fixed #8994 - Datepicker: next and prev buttons are disabled when using yearRange

Browse Source
This commit is contained in:
David Petersen 2013-01-23 13:41:01 -06:00
parent a63c0910a6
commit 8f7c3e309c
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/unit/datepicker/datepicker_options.js
View File

@ -384,7 +384,7 @@ test("miscellaneous", function() {
}); });
test("minMax", function() { test("minMax", function() {
expect( 19 ); expect( 23 );
var date, var date,
inp = TestHelpers.datepicker.init("#inp"), inp = TestHelpers.datepicker.init("#inp"),
dp = $("#ui-datepicker-div"), dp = $("#ui-datepicker-div"),
@ -472,6 +472,22 @@ test("minMax", function() {
ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear"); ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear");
inp.datepicker("setDate", "12/30/" + new Date().getFullYear()); inp.datepicker("setDate", "12/30/" + new Date().getFullYear());
ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear"); ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
inp.datepicker("option", {
minDate: new Date(1900, 0, 1),
maxDate: "-6Y",
yearRange: "1900:-6"
}).val( "" );
ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled");
ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - prev button enabled");
inp.datepicker("option", {
minDate: new Date(1900, 0, 1),
maxDate: "1/25/2007",
yearRange: "1900:2007"
}).val( "" );
ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled");
ok(!dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - prev button enabled");
}); });
test("setDate", function() { test("setDate", function() {

10
ui/jquery.ui.datepicker.js vendored
View File

@ -1918,8 +1918,14 @@ $.extend(Datepicker.prototype, {
if (years){ if (years){
yearSplit = years.split(":"); yearSplit = years.split(":");
currentYear = new Date().getFullYear(); currentYear = new Date().getFullYear();
minYear = parseInt(yearSplit[0], 10) + currentYear; minYear = parseInt(yearSplit[0], 10);
maxYear = parseInt(yearSplit[1], 10) + currentYear; maxYear = parseInt(yearSplit[1], 10);
if ( yearSplit[0].match(/[+\-].*/) ) {
minYear += currentYear;
}
if ( yearSplit[1].match(/[+\-].*/) ) {
maxYear += currentYear;
}
} }
return ((!minDate || date.getTime() >= minDate.getTime()) && return ((!minDate || date.getTime() >= minDate.getTime()) &&