aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widgets.js6
-rw-r--r--test/widgetsSpec.js11
2 files changed, 10 insertions, 7 deletions
diff --git a/src/widgets.js b/src/widgets.js
index 42d56e20..5df92de0 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -45,11 +45,13 @@ function valueAccessor(scope, element) {
format = formatter.format;
parse = formatter.parse;
if (requiredExpr) {
- scope.$watch(requiredExpr, function(newValue) {required = newValue; validate();});
+ scope.$watch(requiredExpr, function(newValue) {
+ required = newValue;
+ validate();
+ });
} else {
required = requiredExpr === '';
}
-
element.data('$validate', validate);
return {
diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js
index dc6050b8..40f52b8e 100644
--- a/test/widgetsSpec.js
+++ b/test/widgetsSpec.js
@@ -233,15 +233,16 @@ describe("widget", function(){
expect(element.hasClass('ng-validation-error')).toBeFalsy();
expect(element.attr('ng-validation-error')).toBeFalsy();
+ scope.$set('price', '');
scope.$set('ineedz', true);
scope.$eval();
- expect(element.hasClass('ng-validation-error')).toBeFalsy();
- expect(element.attr('ng-validation-error')).toBeFalsy();
-
- element.val('');
- element.trigger('keyup');
expect(element.hasClass('ng-validation-error')).toBeTruthy();
expect(element.attr('ng-validation-error')).toEqual('Required');
+
+ element.val('abc');
+ element.trigger('keyup');
+ expect(element.hasClass('ng-validation-error')).toBeFalsy();
+ expect(element.attr('ng-validation-error')).toBeFalsy();
});
it("should process ng-required2", function() {