fix(validators): maxlength should use viewValue for $isEmpty

Narretz · Narretz · commit bfcf9946e16d · 2015-01-29T23:06:23.000+01:00
Closes angular#10898
diff --git a/src/ng/directive/validators.js b/src/ng/directive/validators.js
@@ -65,7 +65,7 @@ var maxlengthDirective = function() {
         ctrl.$validate();
       });
       ctrl.$validators.maxlength = function(modelValue, viewValue) {
-        return (maxlength < 0) || ctrl.$isEmpty(modelValue) || (viewValue.length <= maxlength);
+        return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
       };
     }
   };
diff --git a/test/ng/directive/validatorsSpec.js b/test/ng/directive/validatorsSpec.js
@@ -410,6 +410,20 @@ describe('validators', function() {
       expect($rootScope.value).toBe(12345);
       expect($rootScope.form.input.$error.maxlength).toBeUndefined();
     });
+
+    it('should validate emptiness against the viewValue', function() {
+      var inputElm = helper.compileInput('<input type="text" name="input" ng-model="value" maxlength="10" />');
+
+      var ctrl = inputElm.controller('ngModel');
+      spyOn(ctrl, '$isEmpty').andCallThrough();
+
+      ctrl.$parsers.push(function(value) {
+        return value + '678';
+      });
+
+      helper.changeInputValueTo('12345');
+      expect(ctrl.$isEmpty).toHaveBeenCalledWith('12345');
+    });
   });
 
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ var maxlengthDirective = function() {`
`65`	`65`	`ctrl.$validate();`
`66`	`66`	`});`
`67`	`67`	`ctrl.$validators.maxlength = function(modelValue, viewValue) {`
`68`		`- return (maxlength < 0) \|\| ctrl.$isEmpty(modelValue) \|\| (viewValue.length <= maxlength);`
	`68`	`+ return (maxlength < 0) \|\| ctrl.$isEmpty(viewValue) \|\| (viewValue.length <= maxlength);`
`69`	`69`	`};`
`70`	`70`	`}`
`71`	`71`	`};`