jQuery UI Development

Timestamp:

06/16/08 05:46:11 (6 months ago)

Author:

kbwood.au

Message:

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

Files:

• trunk/ui/ui.datepicker.js (modified) (3 diffs)

trunk/ui/ui.datepicker.js

@@ -962 +962 @@
                         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 "'":
@@ -1162 +1162 @@
                         (showStatus ? this._addStatus(this._get('nextStatus') || ' ') : '') + '>' +
                         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 : '') +
@@ -1369 +1369 @@
                         date.setMilliseconds(0);
                 }
-                return date || (checkRange ? this._rangeStart : null);
+                return (!checkRange || !this._rangeStart ? date :
+                        (!date || this._rangeStart > date ? this._rangeStart : date));
         },