Datepicker: Removed click handling for month and year dropdowns. Fixes #6198 - Datepi...

Thanks jdufresne
(cherry picked from commit 70687f7955cb2471ad6df3a7806031245e5979cd)

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 921f48760b7ee2b1444105d7807ca1448d6906cf..00ce5850d9bda10549e6f7e07ecd75a3cf39d85b 100644 (file)
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -878,7 +878,6 @@ $.extend(Datepicker.prototype, {
        _selectMonthYear: function(id, select, period) {
                var target = $(id);
                var inst = this._getInst(target[0]);
-               inst._selectingMonthYear = false;
                inst['selected' + (period == 'M' ? 'Month' : 'Year')] =
                inst['draw' + (period == 'M' ? 'Month' : 'Year')] =
                        parseInt(select.options[select.selectedIndex].value,10);
@@ -886,18 +885,6 @@ $.extend(Datepicker.prototype, {
                this._adjustDate(target);
        },
 
-       /* Restore input focus after not changing month/year. */
-       _clickMonthYear: function(id) {
-               var target = $(id);
-               var inst = this._getInst(target[0]);
-               if (inst.input && inst._selectingMonthYear) {
-                       setTimeout(function() {
-                               inst.input.focus();
-                       }, 0);
-               }
-               inst._selectingMonthYear = !inst._selectingMonthYear;
-       },
-
        /* Action for selecting a day. */
        _selectDay: function(id, month, year, td) {
                var target = $(id);
@@ -1603,7 +1590,6 @@ $.extend(Datepicker.prototype, {
                        var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear);
                        monthHtml += '<select class="ui-datepicker-month" ' +
                                'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'M\');" ' +
-                               'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
                                '>';
                        for (var month = 0; month < 12; month++) {
                                if ((!inMinYear || month >= minDate.getMonth()) &&
@@ -1637,7 +1623,6 @@ $.extend(Datepicker.prototype, {
                                endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
                                inst.yearshtml += '<select class="ui-datepicker-year" ' +
                                        'onchange="DP_jQuery_' + dpuuid + '.datepicker._selectMonthYear(\'#' + inst.id + '\', this, \'Y\');" ' +
-                                       'onclick="DP_jQuery_' + dpuuid + '.datepicker._clickMonthYear(\'#' + inst.id + '\');"' +
                                        '>';
                                for (; year <= endYear; year++) {
                                        inst.yearshtml += '<option value="' + year + '"' +