Skip to content
This repository was archived by the owner on Feb 19, 2025. It is now read-only.

feat(validate): Support for promises #426

Closed
wants to merge 1 commit into from
Closed

feat(validate): Support for promises #426

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions modules/directives/validate/validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,21 @@ angular.module('ui.directives').directive('uiValidate', function () {

angular.forEach(validateExpr, function (expression, key) {
validateFn = function (valueToValidate) {
if (scope.$eval(expression, { '$value' : valueToValidate })) {
var expression = scope.$eval(expression, { '$value' : valueToValidate });
if (angular.isFunction(expression.then)) {
// expression is a promise
expression.then(function(){
ctrl.$setVa­lid­ity­(key, true);
}, function(){
ctrl.$setVa­lid­ity­(key, false);
});
return valueToValidate;
} else if (expression) {
// expression is true
ctrl.$setValidity(key, true);
return valueToValidate;
} else {
// expression is false
ctrl.$setValidity(key, false);
return undefined;
}
Expand Down Expand Up @@ -63,4 +74,4 @@ angular.module('ui.directives').directive('uiValidate', function () {
}
}
};
});
});