fix(NgModel): make sure the required validator uses the $validators p…

…ipeline Fixes angular#5164
matsko · Jun 10, 2014 · 960d32b · 960d32b
1 parent 678764c
commit 960d32b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
@@ -1781,6 +1781,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
    */
   this.$commitViewValue = function() {
     var viewValue = ctrl.$viewValue;
+
     $timeout.cancel(pendingDebounce);
     if (ctrl.$$lastCommittedViewValue === viewValue) {
       return;
@@ -2130,21 +2131,12 @@ var requiredDirective = function() {
       if (!ctrl) return;
       attr.required = true; // force truthy in case we are on non input element
 
-      var validator = function(value) {
-        if (attr.required && ctrl.$isEmpty(value)) {
-          ctrl.$setValidity('required', false);
-          return;
-        } else {
-          ctrl.$setValidity('required', true);
-          return value;
-        }
+      ctrl.$validators.required = function(modelValue, viewValue) {
+        return !attr.required || !ctrl.$isEmpty(viewValue);
       };
 
-      ctrl.$formatters.push(validator);
-      ctrl.$parsers.unshift(validator);
-
       attr.$observe('required', function() {
-        validator(ctrl.$viewValue);
+        ctrl.$validate();
       });
     }
   };

diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
@@ -2564,7 +2564,7 @@ describe('input', function() {
       compileInput('<input type="text" ng-model="name" name="alias" required />');
 
       scope.$apply(function() {
-        scope.name = '';
+        scope.name = null;
       });
 
       expect(inputElm).toBeInvalid();