diff options
| author | Keith Wood <kbwood.au@gmail.com> | 2010-02-06 23:14:40 +0000 |
|---|---|---|
| committer | Keith Wood <kbwood.au@gmail.com> | 2010-02-06 23:14:40 +0000 |
| commit | 573a402d05ace6c331314712ed3e1cc5e7ace0f1 (patch) | |
| tree | 8a048f2deaac220199085ec0d7f02b9a5a0566ee | |
| parent | c16ed70b68298f83ae9107aad2f07461132d2aad (diff) | |
| download | jquery-ui-573a402d05ace6c331314712ed3e1cc5e7ace0f1.tar.gz jquery-ui-573a402d05ace6c331314712ed3e1cc5e7ace0f1.zip | |
Datepicker: Separate month and year unless both are drop-downs
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 3c0b799a8..91f863ef9 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -1523,7 +1523,7 @@ $.extend(Datepicker.prototype, { var monthHtml = ''; // month selection if (secondary || !changeMonth) - monthHtml += '<span class="ui-datepicker-month">' + monthNames[drawMonth] + '</span> '; + monthHtml += '<span class="ui-datepicker-month">' + monthNames[drawMonth] + '</span>'; else { var inMinYear = (minDate && minDate.getFullYear() == drawYear); var inMaxYear = (maxDate && maxDate.getFullYear() == drawYear); @@ -1541,7 +1541,7 @@ $.extend(Datepicker.prototype, { monthHtml += '</select>'; } if (!showMonthAfterYear) - html += monthHtml + ((secondary || changeMonth || changeYear) && (!(changeMonth && changeYear)) ? ' ' : ''); + html += monthHtml + (secondary || !(changeMonth && changeYear) ? ' ' : ''); // year selection if (secondary || !changeYear) html += '<span class="ui-datepicker-year">' + drawYear + '</span>'; @@ -1572,7 +1572,7 @@ $.extend(Datepicker.prototype, { } html += this._get(inst, 'yearSuffix'); if (showMonthAfterYear) - html += ((secondary || changeMonth || changeYear) && (!(changeMonth && changeYear)) ? ' ' : '') + monthHtml; + html += (secondary || !(changeMonth && changeYear) ? ' ' : '') + monthHtml; html += '</div>'; // Close datepicker_header return html; }, |