Merge pull request #168 from lucax88x/master

Added a global valid method

Author: Huei Tan

API.md

@@ -120,6 +120,10 @@ You can also add a custom validation message by using `message-id` attribute. It
 <!-- Clean, right ? -->
 ```
 
+### **Select a global validation method** `watch blur submit submit-only`**
+
+`validationProvider.setValidMethod('submit')`
+
 ### **Setup a new Validation `setExpression()` `setDefaultMsg()` with `RegExp` or `Function` in config phase**
 <a name="custom-function-huei"></a>
 

dist/angular-validation.js

@@ -3,7 +3,7 @@
   angular.module('validation.provider', []);
   angular.module('validation.directive', ['validation.provider']);
 }).call(this);
-
+
 (function() {
   angular
     .module('validation.provider')
@@ -35,6 +35,12 @@
      */
     var expression = {};
 
+    /**
+     * default valid method
+     * @type {{}}
+     */
+    var validMethod = null;
+
     /**
      * default error, success message
      * @type {{}}
@@ -79,6 +85,23 @@
       return defaultMsg[msg];
     };
 
+    /**
+     * allow user to set the global valid method
+     * @param v
+     * @returns {*}
+     */
+    this.setValidMethod = function(v) {
+      validMethod = v;
+    };
+
+    /**
+     * Get the valid method     
+     * @returns {*}
+     */
+    this.getValidMethod = function() {
+      return validMethod;
+    };
+
     /**
      * Override the errorHTML function
      * @param func
@@ -247,6 +270,8 @@
     this.$get = ['$injector', function($injector) {
       setup($injector);
       return {
+        setValidMethod: this.setValidMethod,
+        getValidMethod: this.getValidMethod,
         setErrorHTML: this.setErrorHTML,
         getErrorHTML: this.getErrorHTML,
         setSuccessHTML: this.setSuccessHTML,
@@ -266,7 +291,7 @@
     }];
   }
 }).call(this);
-
+
 (function() {
   angular
     .module('validation.directive')
@@ -290,7 +315,7 @@
   }
   Reset.$inject = ['$injector'];
 }).call(this);
-
+
 (function() {
   angular
     .module('validation.directive')
@@ -321,7 +346,7 @@
   }
   Submit.$inject = ['$injector'];
 }).call(this);
-
+
 (function() {
   angular
     .module('validation.directive')
@@ -556,6 +581,9 @@
          * Check validator
          */
 
+
+        var validMethod = (angular.isUndefined(attrs.validMethod)) ? $validationProvider.getValidMethod() : attrs.validMethod;
+
         /**
          * Click submit form, check the validity when submit
          */
@@ -565,7 +593,7 @@
 
           isValid = checkValidation(scope, element, attrs, ctrl, validation, value);
 
-          if (attrs.validMethod === 'submit') {
+          if (validMethod === 'submit') {
             // clear previous scope.$watch
             watch();
             watch = scope.$watch(function() {
@@ -606,7 +634,7 @@
         /**
          * Validate blur method
          */
-        if (attrs.validMethod === 'blur') {
+        if (validMethod === 'blur') {
           element.bind('blur', function() {
             var value = scope.$eval(attrs.ngModel);
             scope.$apply(function() {
@@ -620,7 +648,7 @@
         /**
          * Validate submit & submit-only method
          */
-        if (attrs.validMethod === 'submit' || attrs.validMethod === 'submit-only') {
+        if (validMethod === 'submit' || validMethod === 'submit-only') {
           return;
         }
 

dist/angular-validation.min.js

@@ -29,6 +29,12 @@
      */
     var expression = {};
 
+    /**
+     * default valid method
+     * @type {{}}
+     */
+    var validMethod = null;
+
     /**
      * default error, success message
      * @type {{}}
@@ -73,6 +79,23 @@
       return defaultMsg[msg];
     };
 
+    /**
+     * allow user to set the global valid method
+     * @param v
+     * @returns {*}
+     */
+    this.setValidMethod = function(v) {
+      validMethod = v;
+    };
+
+    /**
+     * Get the valid method     
+     * @returns {*}
+     */
+    this.getValidMethod = function() {
+      return validMethod;
+    };
+
     /**
      * Override the errorHTML function
      * @param func
@@ -241,6 +264,8 @@
     this.$get = ['$injector', function($injector) {
       setup($injector);
       return {
+        setValidMethod: this.setValidMethod,
+        getValidMethod: this.getValidMethod,
         setErrorHTML: this.setErrorHTML,
         getErrorHTML: this.getErrorHTML,
         setSuccessHTML: this.setSuccessHTML,

src/provider.js

@@ -232,6 +232,9 @@
          * Check validator
          */
 
+
+        var validMethod = (angular.isUndefined(attrs.validMethod)) ? $validationProvider.getValidMethod() : attrs.validMethod;
+
         /**
          * Click submit form, check the validity when submit
          */
@@ -241,7 +244,7 @@
 
           isValid = checkValidation(scope, element, attrs, ctrl, validation, value);
 
-          if (attrs.validMethod === 'submit') {
+          if (validMethod === 'submit') {
             // clear previous scope.$watch
             watch();
             watch = scope.$watch(function() {
@@ -282,7 +285,7 @@
         /**
          * Validate blur method
          */
-        if (attrs.validMethod === 'blur') {
+        if (validMethod === 'blur') {
           element.bind('blur', function() {
             var value = scope.$eval(attrs.ngModel);
             scope.$apply(function() {
@@ -296,7 +299,7 @@
         /**
          * Validate submit & submit-only method
          */
-        if (attrs.validMethod === 'submit' || attrs.validMethod === 'submit-only') {
+        if (validMethod === 'submit' || validMethod === 'submit-only') {
           return;
         }
 

src/validator.directive.js

@@ -160,4 +160,12 @@ describe('provider', function() {
     expect(successSpy2).not.toHaveBeenCalled();
     expect(errorSpy2).toHaveBeenCalled();
   }));
+  
+  it('set/get validMethod', inject(function() {        
+    expect(validationProvider.getValidMethod()).toEqual(null);
+    
+    validationProvider.setValidMethod('submit');
+    
+    expect(validationProvider.getValidMethod()).toEqual('submit');        
+  }));
 });