Merge pull request #271 from zvaraondrej/using-model-value

Using model value
hueitan · Jan 20, 2017 · 73a8fae · 73a8fae
2 parents aa13b20 + c538ea9
commit 73a8fae
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 4 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -645,6 +645,7 @@ angular.module('validation.directive', ['validation.provider']);
         /**
          * All attributes
          */
+        var useViewValue = attrs.useViewValue !== 'false';
         var validator = attrs.validator;
         var messageId = attrs.messageId;
         var validationGroup = attrs.validationGroup;
@@ -746,7 +747,7 @@ angular.module('validation.directive', ['validation.provider']);
          * Click submit form, check the validity when submit
          */
         scope.$on(ctrl.$name + 'submit-' + uid, function(event, index) {
-          var value = ctrl.$viewValue;
+          var value = useViewValue ? ctrl.$viewValue : ctrl.$modelValue;
           var isValid = false;
 
           isValid = checkValidation(scope, element, attrs, ctrl, validation, value);

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
@@ -267,6 +267,7 @@
         /**
          * All attributes
          */
+        var useViewValue = attrs.useViewValue !== 'false';
         var validator = attrs.validator;
         var messageId = attrs.messageId;
         var validationGroup = attrs.validationGroup;
@@ -368,7 +369,7 @@
          * Click submit form, check the validity when submit
          */
         scope.$on(ctrl.$name + 'submit-' + uid, function(event, index) {
-          var value = ctrl.$viewValue;
+          var value = useViewValue ? ctrl.$viewValue : ctrl.$modelValue;
           var isValid = false;
 
           isValid = checkValidation(scope, element, attrs, ctrl, validation, value);

diff --git a/test/unit/actualValue.js → test/unit/actualValueNoUseViewValue.js b/test/unit/actualValue.js → test/unit/actualValueNoUseViewValue.js
@@ -2,7 +2,7 @@
 
 /* jasmine specs for provider go here */
 
-describe('provider', function() {
+describe('provider without use-view-value', function() {
   var $rootScope;
   var $compile;
   var $scope;