Merge pull request #117 from think2011/master

Fixed Issues #111
hueitan · Jun 4, 2015 · fca3399 · fca3399
2 parents 9cd9977 + f4cd192
commit fca3399
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/dist/angular-validation.js b/dist/angular-validation.js
@@ -364,11 +364,11 @@
 
 
                 /**
-                 * If var is true, focus element when validate end
-                 * @type {boolean}
+                 * collect elements for focus
+                 * @type {Object}
                  ***private variable
                  */
-                var isFocusElement = false;
+                var focusElements = {};
 
 
                 /**
@@ -520,7 +520,6 @@
                              */
                             watch();
 
-                            isFocusElement = false;
                             ctrl.$setViewValue('');
                             ctrl.$setPristine();
                             ctrl.$setValidity(ctrl.$name, undefined);
@@ -543,10 +542,6 @@
                                 var value = ctrl.$viewValue,
                                     isValid = false;
 
-                                if (index === 0) {
-                                    isFocusElement = false;
-                                }
-
                                 isValid = checkValidation(scope, element, attrs, ctrl, validation, value);
 
                                 if (attrs.validMethod === 'submit') {
@@ -570,11 +565,19 @@
 
                                 }
 
-                                // Focus first input element when submit error #11
-                                if (!isFocusElement && !isValid) {
-                                    isFocusElement = true;
-                                    element[0].focus();
-                                }
+                                var setFocus = function(isValid) {
+                                    if(isValid) {
+                                        delete focusElements[index];
+                                    } else {
+                                        focusElements[index] = element[0];
+
+                                        $timeout(function() {
+                                            focusElements[Math.min.apply(null, Object.keys(focusElements))].focus();
+                                        }, 0);
+                                    }
+                                };
+
+                                isValid.constructor === Object ? isValid.then(setFocus) : setFocus(isValid);
                             });
 
                             /**

diff --git a/dist/angular-validation.min.js b/dist/angular-validation.min.js
diff --git a/src/directive.js b/src/directive.js
@@ -72,11 +72,11 @@
 
 
                 /**
-                 * If var is true, focus element when validate end
-                 * @type {boolean}
+                 * collect elements for focus
+                 * @type {Object}
                  ***private variable
                  */
-                var isFocusElement = false;
+                var focusElements = {};
 
 
                 /**
@@ -228,7 +228,6 @@
                              */
                             watch();
 
-                            isFocusElement = false;
                             ctrl.$setViewValue('');
                             ctrl.$setPristine();
                             ctrl.$setValidity(ctrl.$name, undefined);
@@ -251,10 +250,6 @@
                                 var value = ctrl.$viewValue,
                                     isValid = false;
 
-                                if (index === 0) {
-                                    isFocusElement = false;
-                                }
-
                                 isValid = checkValidation(scope, element, attrs, ctrl, validation, value);
 
                                 if (attrs.validMethod === 'submit') {
@@ -278,11 +273,19 @@
 
                                 }
 
-                                // Focus first input element when submit error #11
-                                if (!isFocusElement && !isValid) {
-                                    isFocusElement = true;
-                                    element[0].focus();
-                                }
+                                var setFocus = function(isValid) {
+                                    if(isValid) {
+                                        delete focusElements[index];
+                                    } else {
+                                        focusElements[index] = element[0];
+
+                                        $timeout(function() {
+                                            focusElements[Math.min.apply(null, Object.keys(focusElements))].focus();
+                                        }, 0);
+                                    }
+                                };
+
+                                isValid.constructor === Object ? isValid.then(setFocus) : setFocus(isValid);
                             });
 
                             /**