r1413 - trunk/ui
r1413 - trunk/ui
Author: rdworth
Date: Wed Dec 31 09:15:47 2008
New Revision: 1413
Modified:
trunk/ui/ui.datepicker.js
Log:
Fixed #3712 - Month and year dropdown mis-alignment in datepicker
Modified: trunk/ui/ui.datepicker.js
==============================================================================
--- trunk/ui/ui.datepicker.js (original)
+++ trunk/ui/ui.datepicker.js Wed Dec 31 09:15:47 2008
@@ -1318,6 +1318,7 @@
var dayNamesShort = this._get(inst, 'dayNamesShort');
var dayNamesMin = this._get(inst, 'dayNamesMin');
var monthNames = this._get(inst, 'monthNames');
+ var monthNamesShort = this._get(inst, 'monthNamesShort');
var beforeShowDay = this._get(inst, 'beforeShowDay');
var showOtherMonths = this._get(inst, 'showOtherMonths');
var calculateWeek = this._get(inst, 'calculateWeek') || this.iso8601Week;
@@ -1344,7 +1345,7 @@
(/all|left/.test(cornerClass) && row == 0 ? (isRTL ? next :
prev) : '') +
(/all|right/.test(cornerClass) && row == 0 ? (isRTL ? prev :
next) : '') +
this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate,
maxDate,
- selectedDate, row > 0 || col > 0, monthNames) + // draw month headers
+ selectedDate, row > 0 || col > 0, monthNames, monthNamesShort) + //
draw month headers
'</div><table class="ui-datepicker-calendar"><thead>' +
'<tr>';
var thead = '';
@@ -1414,7 +1415,7 @@
/* Generate the month and year header. */
_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate,
maxDate,
- selectedDate, secondary, monthNames) {
+ selectedDate, secondary, monthNames, monthNamesShort) {
minDate = (inst.rangeStart && minDate && selectedDate < minDate ?
selectedDate : minDate);
var changeMonth = this._get(inst, 'changeMonth');
var changeYear = this._get(inst, 'changeYear');
@@ -1436,12 +1437,12 @@
(!inMaxYear || month <= maxDate.getMonth()))
monthHtml += '<option value="' + month + '"' +
(month == drawMonth ? ' selected="selected"' : '') +
- '>' + monthNames[month] + '</option>';
+ '>' + monthNamesShort[month] + '</option>';
}
monthHtml += '</select>';
}
if (!showMonthAfterYear)
- html += monthHtml + (secondary || changeMonth ||
changeYear ? ' ' : '');
+ html += monthHtml + ((secondary || changeMonth || changeYear) &&
(!(changeMonth && changeYear)) ? ' ' : '');
// year selection
if (secondary || !changeYear)
html += '<span class="ui-datepicker-year">' + drawYear + '</span>';