Skip to content

Fixed Issues #111 #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hueitan merged 2 commits into from
Jun 4, 2015
Merged

Fixed Issues #111 #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7636f2
Fixed Issues #111
think2011 May 30, 2015
f4cd192
Fixed Issues #111
think2011 Jun 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions dist/angular-validation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};


/**
Expand Down Expand Up @@ -520,7 +520,6 @@
*/
watch();

isFocusElement = false;
ctrl.$setViewValue('');
ctrl.$setPristine();
ctrl.$setValidity(ctrl.$name, undefined);
Expand All @@ -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') {
Expand All @@ -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);
});

/**
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-validation.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 16 additions & 13 deletions src/directive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};


/**
Expand Down Expand Up @@ -228,7 +228,6 @@
*/
watch();

isFocusElement = false;
ctrl.$setViewValue('');
ctrl.$setPristine();
ctrl.$setValidity(ctrl.$name, undefined);
Expand All @@ -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') {
Expand All @@ -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);
});

/**
Expand Down