From c818da75c89043a81de6234120315d7d48abc782 Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Wed, 11 Mar 2015 21:31:06 -0500 Subject: [PATCH] fix(input): input validation and visual error indicators fixed Closes #1606. --- src/components/input/input.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/input/input.js b/src/components/input/input.js index 8682b82efe5..4eed23733e1 100644 --- a/src/components/input/input.js +++ b/src/components/input/input.js @@ -170,9 +170,8 @@ function inputTextareaDirective($mdUtil, $window) { setupTextarea(); } - var touched = false; var isErrorGetter = containerCtrl.isErrorGetter || function() { - return ngModelCtrl.$invalid && (touched || ngModelCtrl.$touched); + return ngModelCtrl.$invalid && ngModelCtrl.$touched; }; scope.$watch(isErrorGetter, containerCtrl.setInvalid); @@ -184,9 +183,7 @@ function inputTextareaDirective($mdUtil, $window) { if (!isReadonly) { element .on('focus', function(ev) { - touched = true; containerCtrl.setFocused(true); - scope.$evalAsync(); }) .on('blur', function(ev) { containerCtrl.setFocused(false); @@ -195,6 +192,9 @@ function inputTextareaDirective($mdUtil, $window) { } + //ngModelCtrl.$setTouched(); + //if( ngModelCtrl.$invalid ) containerCtrl.setInvalid(); + scope.$on('$destroy', function() { containerCtrl.setFocused(false); containerCtrl.setHasValue(false);