Skip to content

Develop #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Develop #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5bc80d
fix:min date or max date validate
wonsikin Sep 27, 2017
438a7b1
fix: max and min date validate
wonsikin Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/scripts/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, moment.defaultFormat, true);
return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true;
};
}
Expand All @@ -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, moment.defaultFormat, true);
return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true;
};
}
Expand Down
2 changes: 2 additions & 0 deletions dist/angular-datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, moment.defaultFormat, true);
return minValid ? moment.isMoment(value) && (minDate.isSame(value) || minDate.isBefore(value)) : true;
};
}
Expand All @@ -818,6 +819,7 @@ var PRISTINE_CLASS = 'ng-pristine',
setMax(datePickerUtils.findParam(scope, attrs.maxDate));

ngModel.$validators.max = function (value) {
value = moment(value, moment.defaultFormat, true);
return maxValid ? moment.isMoment(value) && (maxDate.isSame(value) || maxDate.isAfter(value)) : true;
};
}
Expand Down