From f5bc80ded22098ade757ac3a80770c72c58b7307 Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Wed, 27 Sep 2017 15:07:18 +0800 Subject: [PATCH 1/2] fix:min date or max date validate --- app/scripts/input.js | 2 ++ dist/angular-datepicker.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/scripts/input.js b/app/scripts/input.js index 096691b..f52180d 100644 --- a/app/scripts/input.js +++ b/app/scripts/input.js @@ -111,6 +111,7 @@ Module.directive('dateTime', ['$compile', '$document', '$filter', 'dateTimeConfi ngModel.$validators.min = function (value) { //If we don't have a min / max value, then any value is valid. + value = moment(value, format, true); return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true; }; } @@ -119,6 +120,7 @@ Module.directive('dateTime', ['$compile', '$document', '$filter', 'dateTimeConfi setMax(datePickerUtils.findParam(scope, attrs.maxDate)); ngModel.$validators.max = function (value) { + value = moment(value, format, true); return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true; }; } diff --git a/dist/angular-datepicker.js b/dist/angular-datepicker.js index fb1dc57..a581fd5 100644 --- a/dist/angular-datepicker.js +++ b/dist/angular-datepicker.js @@ -810,6 +810,7 @@ var PRISTINE_CLASS = 'ng-pristine', ngModel.$validators.min = function (value) { //If we don't have a min / max value, then any value is valid. + value = moment(value, format, true); return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true; }; } @@ -818,6 +819,7 @@ var PRISTINE_CLASS = 'ng-pristine', setMax(datePickerUtils.findParam(scope, attrs.maxDate)); ngModel.$validators.max = function (value) { + value = moment(value, format, true); return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true; }; } From 438a7b197ce40773ea54a786a84567e0b2050349 Mon Sep 17 00:00:00 2001 From: Arthur Wang Date: Tue, 7 Nov 2017 21:37:22 +0800 Subject: [PATCH 2/2] fix: max and min date validate --- app/scripts/input.js | 4 ++-- dist/angular-datepicker.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/scripts/input.js b/app/scripts/input.js index f52180d..54f4b80 100644 --- a/app/scripts/input.js +++ b/app/scripts/input.js @@ -111,7 +111,7 @@ Module.directive('dateTime', ['$compile', '$document', '$filter', 'dateTimeConfi ngModel.$validators.min = function (value) { //If we don't have a min / max value, then any value is valid. - value = moment(value, format, true); + value = moment(value, moment.defaultFormat, true); return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true; }; } @@ -120,7 +120,7 @@ Module.directive('dateTime', ['$compile', '$document', '$filter', 'dateTimeConfi setMax(datePickerUtils.findParam(scope, attrs.maxDate)); ngModel.$validators.max = function (value) { - value = moment(value, format, true); + value = moment(value, moment.defaultFormat, true); return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true; }; } diff --git a/dist/angular-datepicker.js b/dist/angular-datepicker.js index a581fd5..3966fde 100644 --- a/dist/angular-datepicker.js +++ b/dist/angular-datepicker.js @@ -810,7 +810,7 @@ var PRISTINE_CLASS = 'ng-pristine', ngModel.$validators.min = function (value) { //If we don't have a min / max value, then any value is valid. - value = moment(value, format, true); + value = moment(value, moment.defaultFormat, true); return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true; }; } @@ -819,7 +819,7 @@ var PRISTINE_CLASS = 'ng-pristine', setMax(datePickerUtils.findParam(scope, attrs.maxDate)); ngModel.$validators.max = function (value) { - value = moment(value, format, true); + value = moment(value, moment.defaultFormat, true); return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true; }; }