Skip to content
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

Jump to bottom

Datepicker: Fixed #8420 - Datepicker: calculateWeek doesn't take firstDay setting into account #693

Closed
wants to merge 5 commits into from
Closed

Datepicker: Fixed #8420 - Datepicker: calculateWeek doesn't take firstDay setting into account #693

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c843b45
Datepicker: show the correct number for rows for each month. Fixes #8…
ghiculescu Jul 5, 2012
69e5556
Revert "Datepicker: show the correct number for rows for each month. …
ghiculescu Jul 5, 2012
47bff8b
Datepicker: show the correct number for rows for each month. Fixes #8…
ghiculescu Jul 6, 2012
7741b03
Datepicker: show correct week number when firstDate is non-default. F…
ghiculescu Jul 9, 2012
ab78b60
revert 47bff8b88923189f8bd8649683813155ce4b0aae (fiddling with rows f…
ghiculescu Jul 9, 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
12 changes: 10 additions & 2 deletions ui/jquery.ui.datepicker.js
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1562,8 +1562,16 @@ $.extend(Datepicker.prototype, {
var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays)); var printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
calender += '<tr>'; calender += '<tr>';
var tbody = (!showWeek ? '' : '<td class="ui-datepicker-week-col">' + var tbody = '';
this._get(inst, 'calculateWeek')(printDate) + '</td>'); if (showWeek) { // if the displayed starts and ends in different iso8601 weeks, show both. #8420
var startWeek = this._get(inst, 'calculateWeek')(printDate);
var endDate = new Date(printDate);
endDate.setDate(endDate.getDate() + 6);
endDate = this._daylightSavingAdjust(endDate);
var endWeek = this._get(inst, 'calculateWeek')(endDate);
var weekText = (startWeek === endWeek) ? startWeek : startWeek + "/" + endWeek;
tbody = '<td class="ui-datepicker-week-col">' + weekText + '</td>';
}
for (var dow = 0; dow < 7; dow++) { // create date picker days for (var dow = 0; dow < 7; dow++) { // create date picker days
var daySettings = (beforeShowDay ? var daySettings = (beforeShowDay ?
beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']); beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, '']);
Expand Down