Skip to content
This repository has been archived by the owner on May 12, 2018. It is now read-only.

Commit

Permalink
bugfix(timepicker, datepicker): Required attribute prevents Invalid F…
Browse files Browse the repository at this point in the history
…ormat message
  • Loading branch information
alenaksu committed May 13, 2016
1 parent 6f7ae9d commit e65566f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/mdpDatePicker/mdpDatePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ module.directive("mdpDatePicker", ["$mdpDatePicker", "$timeout", function($mdpDa
};

ngModel.$validators.required = function(modelValue, viewValue) {
return angular.isUndefined(attrs.required) || !ngModel.$isEmpty(modelValue);
return angular.isUndefined(attrs.required) || !ngModel.$isEmpty(modelValue) || !ngModel.$isEmpty(viewValue);
};

ngModel.$parsers.unshift(function(value) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/mdpTimePicker/mdpTimePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ module.directive("mdpTimePicker", ["$mdpTimePicker", "$timeout", function($mdpTi
};

ngModel.$validators.required = function(modelValue, viewValue) {
return angular.isUndefined(attrs.required) || !ngModel.$isEmpty(modelValue);
return angular.isUndefined(attrs.required) || !ngModel.$isEmpty(modelValue) || !ngModel.$isEmpty(viewValue);
};

ngModel.$parsers.unshift(function(value) {
Expand Down

0 comments on commit e65566f

Please sign in to comment.