Skip to content

TD-4184: DIG414: Focus doesn't move to field or error on submit #77

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
Parent: Merge RC Changes to master
merged 1 commit into from
Dec 2, 2024
Merged

TD-4184: DIG414: Focus doesn't move to field or error on submit #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 35 additions & 20 deletions Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,44 @@
</environment>
<script type="text/javascript">
// Add/remove class 'input-validation-error' to the div containing the control with error
$(function () {
$('form').each(function () {
if ($(this).data("validator")) {
var valSettings = $(this).data("validator").settings
valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator)
valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator)
}

let errorElements = [];
let submitAttempted = false;
document.querySelector('form').onsubmit = () => { submitAttempted = true; }

$(function () {
$('form').each(function () {
if ($(this).data("validator")) {
var valSettings = $(this).data("validator").settings;
valSettings.highlight = wrap($.validator.defaults.highlight, highlightDecorator);
valSettings.unhighlight = wrap($.validator.defaults.unhighlight, unhighlightDecorator);
}
});
});
});

function wrap(functionToWrap, beforeFunction) {
return function () {
var args = Array.prototype.slice.call(arguments);
beforeFunction.apply(this, args);
return functionToWrap.apply(this, args);
function wrap(functionToWrap, beforeFunction) {
return function () {
var args = Array.prototype.slice.call(arguments);
beforeFunction.apply(this, args);
if (errorElements.length && submitAttempted) {
errorElements[0]['obj'].focus();
submitAttempted = false;
}

return functionToWrap.apply(this, args);
};
};
};

function highlightDecorator(element, errorClass, validClass) {
$(element).closest("div").addClass(errorClass).removeClass(validClass);
}
function unhighlightDecorator(element, errorClass, validClass) {
$(element).closest("div").addClass(validClass).removeClass(errorClass);
}
function highlightDecorator(element, errorClass, validClass) {
$(element).closest("div").addClass(errorClass).removeClass(validClass);
let itemExists = errorElements.some(obj => obj['id'] == element.id);
if (!itemExists) {
errorElements.push({ 'id': element.id, 'obj': element });
}
}
function unhighlightDecorator(element, errorClass, validClass) {
$(element).closest("div").addClass(validClass).removeClass(errorClass);
errorElements = errorElements.filter((elm) => elm.id != element.id);
}

</script>
Loading