From 529c2dad0b861c9e43227993c1852c210d3e5bf4 Mon Sep 17 00:00:00 2001 From: saehon Date: Thu, 28 Sep 2017 13:19:58 +0300 Subject: [PATCH 1/2] Active day indication when dateSetHidden is set --- src/js/angular-datepicker.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/js/angular-datepicker.js b/src/js/angular-datepicker.js index 971dbc9..bf89853 100644 --- a/src/js/angular-datepicker.js +++ b/src/js/angular-datepicker.js @@ -278,7 +278,7 @@ $scope.year = Number($scope.year) + 1; } , localDateTimestamp = function localDateTimestamp(rawDate, dateFormatDefinition) { - + var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|MMMM|MMM|MM|M|dd?d?|yy?yy?y?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g ,formatDate,dateSplit, m, d, y, index, el, longName, shortName; @@ -294,7 +294,7 @@ if (rawDate.indexOf(shortName) !== -1) { rawDate = rawDate.replace(shortName, index + 1); break; - } + } } dateSplit = rawDate @@ -323,11 +323,11 @@ } case el.indexOf('y') !== -1: { y = dateSplit[index - (formatDate.length - dateSplit.length)]; - break; + break; } default: { - break; - } + break; + } } } @@ -411,6 +411,9 @@ } else { date = new Date(thisInput[0].value.toString()); } + if(isNaN(date) && $scope.dateSet) { + date = new Date($scope.dateSet) + } $scope.selectedMonth = Number($filter('date')(date, 'MM')); $scope.selectedDay = Number($filter('date')(date, 'dd')); $scope.selectedYear = Number($filter('date')(date, 'yyyy')); From b3c783e644b7f2f2f7f394fb809e913cd346bad0 Mon Sep 17 00:00:00 2001 From: saehon Date: Thu, 28 Sep 2017 13:30:16 +0300 Subject: [PATCH 2/2] Same when opened programaticaly --- src/js/angular-datepicker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/angular-datepicker.js b/src/js/angular-datepicker.js index bf89853..9681684 100644 --- a/src/js/angular-datepicker.js +++ b/src/js/angular-datepicker.js @@ -411,7 +411,7 @@ } else { date = new Date(thisInput[0].value.toString()); } - if(isNaN(date) && $scope.dateSet) { + if(isNaN(Date.parse(date)) && $scope.dateSet) { date = new Date($scope.dateSet) } $scope.selectedMonth = Number($filter('date')(date, 'MM')); @@ -452,6 +452,9 @@ } else { date = new Date(thisInput[0].value.toString()); } + if(isNaN(Date.parse(date)) && $scope.dateSet) { + date = new Date($scope.dateSet) + } $scope.selectedMonth = Number($filter('date')(date, 'MM')); $scope.selectedDay = Number($filter('date')(date, 'dd')); $scope.selectedYear = Number($filter('date')(date, 'yyyy'));