Merge pull request #223 from nmccready/originalValueTracking

Track originalViewValue
hueitan · Jul 21, 2016 · f26019c · f26019c
2 parents f87a51c + 5d9085d
commit f26019c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -646,6 +646,10 @@ angular.module('validation.directive', ['validation.provider']);
          */
         var uid = ctrl.validationId = guid();
 
+        /**
+         * to have avalue to rollback to
+         */
+        var originalViewValue = null;
 
         /**
          * Set initial validity to undefined if no boolean value is transmitted
@@ -687,7 +691,7 @@ angular.module('validation.directive', ['validation.provider']);
           watch();
 
           $timeout(function() {
-            ctrl.$setViewValue('');
+            ctrl.$setViewValue(originalViewValue);
             ctrl.$setPristine();
             ctrl.$setValidity(ctrl.$name, undefined);
             ctrl.$render();
@@ -783,6 +787,7 @@ angular.module('validation.directive', ['validation.provider']);
            */
           if (ctrl.$pristine && ctrl.$viewValue) {
             // has value when initial
+            originalViewValue = ctrl.$viewValue || '';
             ctrl.$setViewValue(ctrl.$viewValue);
           } else if (ctrl.$pristine) {
             // Don't validate form when the input is clean(pristine)

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/validator.directive.js b/src/validator.directive.js
@@ -268,6 +268,10 @@
          */
         var uid = ctrl.validationId = guid();
 
+        /**
+         * to have a value to rollback to
+         */
+        var originalViewValue = null;
 
         /**
          * Set initial validity to undefined if no boolean value is transmitted
@@ -309,7 +313,7 @@
           watch();
 
           $timeout(function() {
-            ctrl.$setViewValue('');
+            ctrl.$setViewValue(originalViewValue);
             ctrl.$setPristine();
             ctrl.$setValidity(ctrl.$name, undefined);
             ctrl.$render();
@@ -405,6 +409,7 @@
            */
           if (ctrl.$pristine && ctrl.$viewValue) {
             // has value when initial
+            originalViewValue = ctrl.$viewValue || '';
             ctrl.$setViewValue(ctrl.$viewValue);
           } else if (ctrl.$pristine) {
             // Don't validate form when the input is clean(pristine)