Merge pull request #134 from angular/master

Support multiple versions of
javascript-indonesias · Jan 30, 2019 · 5d952e3 · 5d952e3
2 parents 087f765 + 005dd97
commit 5d952e3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/src/ng/directive/validators.js b/src/ng/directive/validators.js
@@ -68,17 +68,17 @@ var requiredDirective = ['$parse', function($parse) {
     require: '?ngModel',
     link: function(scope, elm, attr, ctrl) {
       if (!ctrl) return;
-      var oldVal = attr.required || $parse(attr.ngRequired)(scope);
+      var value = attr.required || $parse(attr.ngRequired)(scope);
 
       attr.required = true; // force truthy in case we are on non input element
 
       ctrl.$validators.required = function(modelValue, viewValue) {
-        return !attr.required || !ctrl.$isEmpty(viewValue);
+        return !value || !ctrl.$isEmpty(viewValue);
       };
 
-      attr.$observe('required', function(val) {
-        if (oldVal !== val) {
-          oldVal = val;
+      attr.$observe('required', function(newVal) {
+        if (value !== newVal) {
+          value = newVal;
           ctrl.$validate();
         }
       });

diff --git a/test/ng/directive/validatorsSpec.js b/test/ng/directive/validatorsSpec.js
@@ -730,5 +730,19 @@ describe('validators', function() {
 
       expect(helper.validationCounter.required).toBe(1);
     });
+
+    it('should validate once when inside ngRepeat, and set the "required" error when ngRequired is false by default', function() {
+      $rootScope.isRequired = false;
+      $rootScope.refs = {};
+
+      var elm = helper.compileInput(
+        '<div ng-repeat="input in [0]">' +
+          '<input type="text" ng-ref="refs.input" ng-ref-read="ngModel" ng-model="value" ng-required="isRequired" validation-spy="required" />' +
+        '</div>');
+
+      expect(helper.validationCounter.required).toBe(1);
+      expect($rootScope.refs.input.$error.required).toBeUndefined();
+    });
+
   });
 });