Merge remote-tracking branch 'upstream/master'

Author: Nazanin1369

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>
 

Q&A.md

@@ -26,3 +26,7 @@ Before using `checkValid()`, you have to execute `submit` first to get the lates
 ###How do we do tooltips for error messages upon focusing? [#68](https://github.com/huei90/angular-validation/issues/68#issuecomment-86445467)
 
 Using `validCallback` and `invalidCallback` to implement
+
+###Can this works correctly with AngularUI, ui-select, others ... ?###
+
+Yes, `angular-validation` works perfectly with other directive. (isolation scope). Find out more from the demo page.

bower.json

@@ -24,9 +24,5 @@
     "tests"
   ],
   "dependencies": {
-    "bootstrap": "~3.3.6",
-    "angular-bootstrap": "~0.14.3",
-    "ui-select": "angular-ui-select#~0.13.2",
-    "angular-sanitize": "~0.0.2"
   }
 }

demo/demo.js

@@ -90,6 +90,7 @@
   // -------------------
   .controller('index', ['$scope', '$injector', function($scope, $injector) {
     // Injector
+
     var $validationProvider = $injector.get('$validation');
 
     // Initial Value
@@ -150,6 +151,7 @@
       checkValid: $validationProvider.checkValid
     };
 
+    // Bootstrap Datepicker
     $scope.form7 = {
       dt: new Date(),
       open: function($event) {

dist/angular-validation.js

@@ -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,
@@ -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;
         }