Fixed #2658 Next link shows > when hideIfNoPrevNext is true

Fixed #2700 Datepicker does not allow manual entry of alphabetic characters
Fixed #2724 Date range + restricting allows invalid range

diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js
index 643f6de0447c5a28ee05ea7ec7dd270ea70322b5..4a5447671fd9e36d1380aaf479cc7f9a1c3d3adf 100644 (file)
--- a/ui/ui.datepicker.js
+++ b/ui/ui.datepicker.js
@@ -961,10 +961,10 @@ $.extend(Datepicker.prototype, {
                                        chars += format.charAt(iFormat);
                        else
                                switch (format.charAt(iFormat)) {
-                                       case 'd' || 'm' || 'y':
+                                       case 'd': case 'm': case 'y':
                                                chars += '0123456789'; 
                                                break;
-                                       case 'D' || 'M':
+                                       case 'D': case 'M':
                                                return null; // Accept anything
                                        case "'":
                                                if (lookAhead("'"))
@@ -1161,7 +1161,7 @@ $.extend(DatepickerInstance.prototype, {
                        '<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', +' + stepMonths + ', \'M\');"' +
                        (showStatus ? this._addStatus(this._get('nextStatus') || '&#xa0;') : '') + '>' +
                        this._get('nextText') + '</a>' :
-                       (hideIfNoPrevNext ? '>' : '<label>' + this._get('nextText') + '</label>')) + '</div>';
+                       (hideIfNoPrevNext ? '' : '<label>' + this._get('nextText') + '</label>')) + '</div>';
                var html = (prompt ? '<div class="' + $.datepicker._promptClass + '">' + prompt + '</div>' : '') +
                        (closeAtTop && !this._inline ? controls : '') +
                        '<div class="ui-datepicker-links">' + (isRTL ? next : prev) +
@@ -1368,7 +1368,8 @@ $.extend(DatepickerInstance.prototype, {
                        date.setSeconds(0);
                        date.setMilliseconds(0);
                }
-               return date || (checkRange ? this._rangeStart : null);
+               return (!checkRange || !this._rangeStart ? date :
+                       (!date || this._rangeStart > date ? this._rangeStart : date));
        },
 
        /* Find the number of days in a given month. */