fix(input): $asyncValidators should allow $parsers

After resolving the async validators, it should execute all parsers on the viewValue before comparing it to the currentValue.
angular · Sep 2, 2014 · 2fed968 · 2fed968
1 parent 203ea10
commit 2fed968
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
@@ -1709,7 +1709,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
     $animate.removeClass($element, PENDING_CLASS);
   };
 
-  this.$$setPending = function(validationErrorKey, promise, currentValue) {
+  this.$$setPending = function(validationErrorKey, promise, modelValue, viewValue) {
     ctrl.$pending = ctrl.$pending || {};
     if (angular.isUndefined(ctrl.$pending[validationErrorKey])) {
       ctrl.$pending[validationErrorKey] = true;
@@ -1725,19 +1725,20 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
 
     //Special-case for (undefined|null|false|NaN) values to avoid
     //having to compare each of them with each other
-    currentValue = currentValue || '';
+    viewValue = viewValue || '';
     promise.then(resolve(true), resolve(false));
 
     function resolve(bool) {
       return function() {
-        var value = ctrl.$viewValue || '';
-        if (ctrl.$pending && ctrl.$pending[validationErrorKey] && currentValue === value) {
+        var value = ctrl.$viewValue;
+        value =  value || '';
+        if (ctrl.$pending && ctrl.$pending[validationErrorKey] && viewValue === value) {
           pendingCount--;
           delete ctrl.$pending[validationErrorKey];
           ctrl.$setValidity(validationErrorKey, bool);
           if (pendingCount === 0) {
             ctrl.$$clearPending();
-            ctrl.$$updateValidModelValue(value);
+            ctrl.$$updateValidModelValue(modelValue);
             ctrl.$$writeModelToScope();
           }
         }
@@ -1947,7 +1948,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
           throw $ngModelMinErr("$asyncValidators",
             "Expected asynchronous validator to return a promise but got '{0}' instead.", result);
         }
-        ctrl.$$setPending(validator, result, modelValue);
+        ctrl.$$setPending(validator, result, modelValue, viewValue);
       });
     }
 

diff --git a/test/ng/directive/inputSpec.js b/test/ng/directive/inputSpec.js
@@ -730,6 +730,31 @@ describe('NgModelController', function() {
       dealoc(element);
     }));
 
+    it('should re-evaluate the form validity state against a parsed view value',
+      inject(function($compile, $rootScope, $q) {
+      var element = $compile('<form name="myForm">' +
+                               '<input type="number" name="curiousnumber" ng-model="curiousnumber" />' +
+                             '</form>')($rootScope);
+      var inputElm = element.find('input');
+
+      var formCtrl = $rootScope.myForm;
+      var curiousnumberCtrl = formCtrl.curiousnumber;
+      var curiousnumberDefer;
+      curiousnumberCtrl.$asyncValidators.isCurious = function() {
+        curiousnumberDefer = $q.defer();
+        return curiousnumberDefer.promise;
+      };
+
+      curiousnumberCtrl.$setViewValue("22");
+      $rootScope.$digest();
+      expect(curiousnumberCtrl.$pending.isCurious).toBe(true);
+
+      curiousnumberDefer.resolve();
+      $rootScope.$digest();
+      expect(curiousnumberCtrl.$pending).toBeUndefined();
+
+      dealoc(element);
+    }));
   });
 });