Datepicker: Update parseDate to properly handle a string value in shortYearCutoff...

diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index af561a78389b4aa40b7103429032e2837e1e1a75..33b07d6949d5d5578d67ea96f1a5a269135e44c7 100644 (file)
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -796,16 +796,21 @@ test('parseDate', function() {
        equalsDate($.datepicker.parseDate('\'day\' d \'of\' MM (\'\'DD\'\'), yy',
                'day 3 of February (\'Saturday\'), 2001'), new Date(2001, 2 - 1, 3),
                'Parse date \'day\' d \'of\' MM (\'\'DD\'\'), yy');
-       equalsDate($.datepicker.parseDate('ymmdd', '010203'),
-               new Date(2001, 2 - 1, 3), 'Parse date ymmdd - default cutoff');
-       equalsDate($.datepicker.parseDate('y-m-d', '01-02-03'),
-               new Date(2001, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-       equalsDate($.datepicker.parseDate('y-m-d', '51-02-03'),
-               new Date(1951, 2 - 1, 3), 'Parse date y-m-d - default cutoff');
-       equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: 80}),
-               new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
-       equalsDate($.datepicker.parseDate('y-m-d', '51-02-03', {shortYearCutoff: '+60'}),
-               new Date(2051, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
+       var currentYear = new Date().getFullYear();
+       equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000) + '-02-03'),
+                       new Date(currentYear, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+       equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 10) + '-02-03'),
+                       new Date(currentYear+10, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+       equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 11) + '-02-03'),
+                       new Date(currentYear-89, 2 - 1, 3), 'Parse date y-m-d - default cutuff');
+       equalsDate($.datepicker.parseDate('y-m-d', '80-02-03', {shortYearCutoff: 80}),
+               new Date(2080, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
+       equalsDate($.datepicker.parseDate('y-m-d', '81-02-03', {shortYearCutoff: 80}),
+               new Date(1981, 2 - 1, 3), 'Parse date y-m-d - cutoff 80');
+       equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 60) + '-02-03', {shortYearCutoff: '+60'}),
+                       new Date(currentYear + 60, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
+       equalsDate($.datepicker.parseDate('y-m-d', (currentYear - 2000 + 61) + '-02-03', {shortYearCutoff: '+60'}),
+                       new Date(currentYear - 39, 2 - 1, 3), 'Parse date y-m-d - cutoff +60');
        var gmtDate = new Date(2001, 2 - 1, 3);
        gmtDate.setMinutes(gmtDate.getMinutes() - gmtDate.getTimezoneOffset());
        equalsDate($.datepicker.parseDate('@', '981158400000'), gmtDate, 'Parse date @');

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 3ca6a34fb39b1bdecb9b75070436b75417aaf9e4..6b46dcfe27ca2eb3d05386813515f5d5103a93ca 100644 (file)
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -966,6 +966,8 @@ $.extend(Datepicker.prototype, {
                if (value == '')
                        return null;
                var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+               shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+                               new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
                var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
                var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
                var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;