Skip to content

Datepicker: Ticket 7362, range checks allow you to go past yearRange, which causes weird glitches #271

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
fracmak wants to merge 3 commits into from
Closed

Datepicker: Ticket 7362, range checks allow you to go past yearRange, which causes weird glitches #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4eeab67
Updated the range tests so you can't navigate past the yearRange whic…
fracmak May 13, 2011
d3f4ad2
made unit test description better
fracmak Nov 13, 2012
43dc1ac
fix whitespace
fracmak Nov 13, 2012
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
8 changes: 7 additions & 1 deletion tests/unit/datepicker/datepicker_options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,10 @@ test('miscellaneous', function() {
});

test('minMax', function() {
expect( 17 );
expect( 19 );
var date,
inp = TestHelpers.datepicker.init('#inp'),
dp = $('#ui-datepicker-div'),
lastYear = new Date(2007, 6 - 1, 4),
nextYear = new Date(2009, 6 - 1, 4),
minDate = new Date(2008, 2 - 1, 29),
Expand Down Expand Up @@ -404,6 +405,11 @@ test('minMax', function() {
TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min, < max');
inp.datepicker('option', {maxDate: null}).val('01/04/2009').datepicker('option', {minDate: minDate, maxDate: maxDate});
TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max');

inp.datepicker('option', {yearRange: '-0:+1'}).val('01/01/' + new Date().getFullYear());
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());
ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear");
});

test('setDate', function() {
Expand Down
14 changes: 13 additions & 1 deletion ui/jquery.ui.datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1742,8 +1742,20 @@ $.extend(Datepicker.prototype, {
_isInRange: function(inst, date) {
var minDate = this._getMinMaxDate(inst, 'min');
var maxDate = this._getMinMaxDate(inst, 'max');
var minYear = null;
var maxYear = null;
var years = this._get(inst, 'yearRange');
if (years){
var yearSplit = years.split(':');
var currentYear = new Date().getFullYear();
minYear = parseInt(yearSplit[0]) + currentYear;
maxYear = parseInt(yearSplit[1]) + currentYear;
}

return ((!minDate || date.getTime() >= minDate.getTime()) &&
(!maxDate || date.getTime() <= maxDate.getTime()));
(!maxDate || date.getTime() <= maxDate.getTime()) &&
(!minYear || date.getFullYear() >= minYear) &&
(!maxYear || date.getFullYear() <= maxYear));
},

/* Provide the configuration settings for formatting/parsing. */
Expand Down