Skip to content

Commit

Permalink
Merge branch 'datepicker-year-order' into v1-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielRuf committed Jul 10, 2020
2 parents 5d11292 + 37cb66d commit 5a4c33c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 7 additions & 1 deletion jade/page-contents/pickers_content.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ <h5>Options</h5>
<td>10</td>
<td>Number of years either side, or array of upper/lower range.</td>
</tr>
<tr>
<td>yearRangeReverse</td>
<td>Boolean</td>
<td>false</td>
<td>Sort year range in reverse order</td>
</tr>
<tr>
<td>isRTL</td>
<td>Boolean</td>
Expand Down Expand Up @@ -760,4 +766,4 @@ <h5 class="method-header">
</div>

</div>
</div>
</div>
7 changes: 4 additions & 3 deletions js/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,7 @@
}
return (
`<td data-day="${opts.day}" class="${arr.join(' ')}" aria-selected="${ariaSelected}">` +
`<button class="datepicker-day-button" type="button" data-year="${opts.year}" data-month="${
opts.month
}" data-day="${opts.day}">${opts.day}</button>` +
`<button class="datepicker-day-button" type="button" data-year="${opts.year}" data-month="${opts.month}" data-day="${opts.day}">${opts.day}</button>` +
'</td>'
);
}
Expand Down Expand Up @@ -609,6 +607,9 @@
arr.push(`<option value="${i}" ${i === year ? 'selected="selected"' : ''}>${i}</option>`);
}
}
if (opts.yearRangeReverse) {
arr.reverse();
}

yearHtml = `<select class="datepicker-select orig-select-year" tabindex="-1">${arr.join(
''
Expand Down

0 comments on commit 5a4c33c

Please sign in to comment.