From f826f842ace394149663670d9a7920d7f52768a2 Mon Sep 17 00:00:00 2001 From: Sergio Sanguanini Date: Tue, 15 Jul 2014 15:56:01 +0200 Subject: [PATCH 1/2] Update input.js --- src/ng/directive/input.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js index bf3111e8ffcd..199e14e958d3 100644 --- a/src/ng/directive/input.js +++ b/src/ng/directive/input.js @@ -2319,7 +2319,7 @@ var maxlengthDirective = function() { ctrl.$validate(); }); ctrl.$validators.maxlength = function(value) { - return ctrl.$isEmpty(value) || value.length <= maxlength; + return ctrl.$isEmpty(value) || String(value).length <= maxlength; }; } }; @@ -2337,7 +2337,7 @@ var minlengthDirective = function() { ctrl.$validate(); }); ctrl.$validators.minlength = function(value) { - return ctrl.$isEmpty(value) || value.length >= minlength; + return ctrl.$isEmpty(value) || String(value).length >= minlength; }; } }; From 2bc74293cbd658c01cf89cdf54ea8a93dd5ce668 Mon Sep 17 00:00:00 2001 From: Sergio Sanguanini Date: Tue, 15 Jul 2014 16:32:17 +0200 Subject: [PATCH 2/2] Update input.js --- src/ng/directive/input.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js index 199e14e958d3..21817e304cec 100644 --- a/src/ng/directive/input.js +++ b/src/ng/directive/input.js @@ -2318,8 +2318,11 @@ var maxlengthDirective = function() { maxlength = int(value) || 0; ctrl.$validate(); }); - ctrl.$validators.maxlength = function(value) { - return ctrl.$isEmpty(value) || String(value).length <= maxlength; + ctrl.$validators.maxlength = function(value, viewValue) { + if (!isString(value)) { + value = viewValue; + } + return ctrl.$isEmpty(value) || value.length <= maxlength; }; } }; @@ -2336,8 +2339,11 @@ var minlengthDirective = function() { minlength = int(value) || 0; ctrl.$validate(); }); - ctrl.$validators.minlength = function(value) { - return ctrl.$isEmpty(value) || String(value).length >= minlength; + ctrl.$validators.minlength = function(value, viewValue) { + if (!isString(value)) { + value = viewValue; + } + return ctrl.$isEmpty(value) || value.length >= minlength; }; } };