From d940c6b2d8276fd3749ea52e2b3f849fb32b5015 Mon Sep 17 00:00:00 2001 From: Amsul Date: Sat, 12 Apr 2014 22:03:56 -0400 Subject: [PATCH] fixes #384: year dropdown appears before month --- lib/picker.date.js | 7 ++++--- tests/dev/date.htm | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/picker.date.js b/lib/picker.date.js index 515e155a..f5eaf119 100644 --- a/lib/picker.date.js +++ b/lib/picker.date.js @@ -1008,7 +1008,9 @@ DatePicker.prototype.nodes = function( isOpen ) { // Create the month label. - createMonthLabel = function( monthsCollection ) { + createMonthLabel = function() { + + var monthsCollection = settings.showMonthsShort ? settings.monthsShort : settings.monthsFull // If there are months to select, add a dropdown menu. if ( settings.selectMonths ) { @@ -1109,8 +1111,7 @@ DatePicker.prototype.nodes = function( isOpen ) { return _.node( 'div', createMonthNav() + createMonthNav( 1 ) + - createMonthLabel( settings.showMonthsShort ? settings.monthsShort : settings.monthsFull ) + - createYearLabel(), + ( settings.selectYears ? createYearLabel() + createMonthLabel() : createMonthLabel() + createYearLabel() ), settings.klass.header ) + _.node( 'table', diff --git a/tests/dev/date.htm b/tests/dev/date.htm index 2a5d19cf..f2e809e5 100644 --- a/tests/dev/date.htm +++ b/tests/dev/date.htm @@ -41,8 +41,8 @@

name="date" type="date" autofocus - value="14-08-08" - data-value="2014-08-08"> + valuee="14-08-08" + data-valuee="2014-08-08">




@@ -60,15 +60,15 @@