Rename monthAfterYear setting to showMonthAfterYear

diff --git a/demos/functional/templates/ui.datepicker.html b/demos/functional/templates/ui.datepicker.html
index 3e5b90d55d74f488818b9db1995b1b9b2263e3fe..b9efd2c9a16c1b0ef7cc2a30017d18e392a03029 100644 (file)
--- a/demos/functional/templates/ui.datepicker.html
+++ b/demos/functional/templates/ui.datepicker.html
@@ -256,7 +256,7 @@
                                        {       desc: 'Prev/Today/Next links as date formats',  source: '$("#misc").datepicker({navigationAsDateFormat: true, prevText: "<M", currentText: "M y", nextText: "M>", showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
                                        {       desc: 'Prev/Today/Next links as date formats in French',        source: '$("#misc").datepicker($.extend({}, $.datepicker.regional["fr"], {navigationAsDateFormat: true, prevText: "<MM", currentText: "MM yy", nextText: "MM>", numberOfMonths: 2, stepMonths: 2, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true}));' },
                                        {       desc: 'Today link goes to current selection',   source: '$("#misc").datepicker({gotoCurrent: true, currentText: "Current", showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
-                                       {       desc: 'Show the month select after the year one',       source: '$("#misc").datepicker({monthAfterYear: true, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
+                                       {       desc: 'Show the month select after the year one',       source: '$("#misc").datepicker({showMonthAfterYear: true, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
                                        {       desc: 'Highlight the hovered week',     source: '$("#misc").datepicker({highlightWeek: true, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
                                        {       desc: 'Show days from other months',    source: '$("#misc").datepicker({showOtherMonths: true, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },
                                        {       desc: 'Show week of the year (ISO 8601)',       source: '$("#misc").datepicker({showWeeks: true, firstDay: 1, changeFirstDay: false, showOtherMonths: true, showOn: "both", buttonImage: "templates/images/calendar.gif", buttonImageOnly: true});' },

diff --git a/ui/ui.datepicker.js b/ui/ui.datepicker.js
index e60b1bc18ac681036e058fc100cb252066c8bb51..e780c97dabd50c6d188e8a04a0a1038940e319be 100644 (file)
--- a/ui/ui.datepicker.js
+++ b/ui/ui.datepicker.js
@@ -91,7 +91,7 @@ function Datepicker() {
                gotoCurrent: false, // True if today link goes back to current selection instead
                changeMonth: true, // True if month can be selected directly, false if only prev/next
                changeYear: true, // True if year can be selected directly, false if only prev/next
-               monthAfterYear: false, // True if the year select precedes month, false for month then year
+               showMonthAfterYear: false, // True if the year select precedes month, false for month then year
                yearRange: '-10:+10', // Range of years to display in drop-down,
                        // either relative to current year (-nn:+nn) or absolute (nnnn:nnnn)
                changeFirstDay: true, // True to click on day name to change, false to remain as set
@@ -1440,7 +1440,7 @@ $.extend(Datepicker.prototype, {
        _generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
                        selectedDate, secondary, showStatus, initStatus, monthNames) {
                minDate = (inst.rangeStart && minDate && selectedDate < minDate ? selectedDate : minDate);
-               var monthAfterYear = this._get(inst, 'monthAfterYear');
+               var showMonthAfterYear = this._get(inst, 'showMonthAfterYear');
                var html = '<div class="ui-datepicker-header">';
                var monthHtml = '';
                // month selection
@@ -1462,7 +1462,7 @@ $.extend(Datepicker.prototype, {
                        }
                        monthHtml += '</select>';
                }
-               if (!monthAfterYear)
+               if (!showMonthAfterYear)
                        html += monthHtml;
                // year selection
                if (secondary || !this._get(inst, 'changeYear'))
@@ -1496,7 +1496,7 @@ $.extend(Datepicker.prototype, {
                        }
                        html += '</select>';
                }
-               if (monthAfterYear)
+               if (showMonthAfterYear)
                        html += monthHtml;
                html += '</div>'; // Close datepicker_header
                return html;