From d4ce205f7a0dacea636d9167f3f620a8d4997c4b Mon Sep 17 00:00:00 2001 From: "Bogatyrev.P" Date: Wed, 15 Nov 2017 16:09:37 +0300 Subject: [PATCH 1/3] Selecting year improovement - replace first and last year labels with '...' to make it clear, that user can select years earlier and later then yearRange. --- ui/widgets/datepicker.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js index 63f713ec026..09de1a2f211 100644 --- a/ui/widgets/datepicker.js +++ b/ui/widgets/datepicker.js @@ -1841,7 +1841,7 @@ $.extend( Datepicker.prototype, { _generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate, secondary, monthNames, monthNamesShort ) { - var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear, + var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear, firstYear, changeMonth = this._get( inst, "changeMonth" ), changeYear = this._get( inst, "changeYear" ), showMonthAfterYear = this._get( inst, "showMonthAfterYear" ), @@ -1888,12 +1888,13 @@ $.extend( Datepicker.prototype, { year = determineYear( years[ 0 ] ); endYear = Math.max( year, determineYear( years[ 1 ] || "" ) ); year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year ); + firstYear = year; endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear ); inst.yearshtml += ""; From 3c62e365a90bb7f55d5ba5975eef203bebb48ca3 Mon Sep 17 00:00:00 2001 From: "Bogatyrev.P" Date: Wed, 15 Nov 2017 16:17:50 +0300 Subject: [PATCH 2/3] Code style fix. --- ui/widgets/datepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js index 09de1a2f211..f6d954915f8 100644 --- a/ui/widgets/datepicker.js +++ b/ui/widgets/datepicker.js @@ -1894,7 +1894,7 @@ $.extend( Datepicker.prototype, { for ( ; year <= endYear; year++ ) { inst.yearshtml += ""; + ">" + ( ( year == firstYear || year == endYear ) ? "..." : year ) + ""; } inst.yearshtml += ""; From b7edfecbc6c4b2488ceeb99b2e30262c0f4c24b4 Mon Sep 17 00:00:00 2001 From: "Bogatyrev.P" Date: Wed, 22 Nov 2017 11:27:31 +0300 Subject: [PATCH 3/3] Fixed code style. --- ui/widgets/datepicker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js index f6d954915f8..3cfe9ce3c9b 100644 --- a/ui/widgets/datepicker.js +++ b/ui/widgets/datepicker.js @@ -1894,7 +1894,7 @@ $.extend( Datepicker.prototype, { for ( ; year <= endYear; year++ ) { inst.yearshtml += ""; + ">" + ( ( year === firstYear || year === endYear ) ? "..." : year ) + ""; } inst.yearshtml += "";