Skip to content
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

Apply user options to per field validation #901

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Apply user options to per field validation #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bac7c2
Ignore eclipse resources
sphenk Oct 23, 2015
f3b899d
Apply user options to per field validation
sphenk Oct 23, 2015
c3cbf49
update of dutch (nl) localization
sphenk Oct 23, 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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@
.DS_Store
/js/jquery.validationEngine.log.txt
/js/jquery.validationEngine.js.min.js.log.txt
/js/jquery.validationEngine-en.log.txt
/js/jquery.validationEngine-en.log.txt
/.settings/
/.gitignore
/.project
41 changes: 29 additions & 12 deletions js/jquery.validationEngine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,17 +133,21 @@
element.removeClass('validating');
} else {
// field validation
var form = element.closest('form, .validationEngineContainer');
options = (form.data('jqv')) ? form.data('jqv') : $.validationEngine.defaults;
valid = methods._validateField(element, options);

if (valid && options.onFieldSuccess)
options.onFieldSuccess();
else if (options.onFieldFailure && options.InvalidFields.length > 0) {
options.onFieldFailure();
}

return !valid;
var form = element.closest('form, .validationEngineContainer');
if(userOptions) {
options = methods._mergeWithFormOptions(form, userOptions);
} else {
options = (form.data('jqv')) ? form.data('jqv') : $.validationEngine.defaults;
}
valid = methods._validateField(element, options);

if (valid && options.onFieldSuccess)
options.onFieldSuccess();
else if (options.onFieldFailure && options.InvalidFields.length > 0) {
options.onFieldFailure();
}

return !valid;
}
if(options.onValidationComplete) {
// !! ensures that an undefined return is interpreted as return false but allows a onValidationComplete() to possibly return true and have form continue processing
Expand Down Expand Up @@ -1984,7 +1988,20 @@
form.data('jqv', userOptions);
return userOptions;
},

/**
* Merge the user options for field validation with the form validaton options or otherwise with the defaults
*
* @param {jqObject}
* form - the form where the user option should be saved
* @param {Map}
* options - the user options
* @return the user options (extended from the form options)
*/
_mergeWithFormOptions: function(form, userOptions) {
var options = form.data('jqv') ? form.data('jqv') : $.validationEngine.defaults;
options = $.extend(true,{},options,userOptions);
return options;
},
/**
* Removes forbidden characters from class name
* @param {String} className
Expand Down
8 changes: 3 additions & 5 deletions js/languages/jquery.validationEngine-nl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"minSize": {
"regex": "none",
"alertText": "* Minimaal ",
"alertText2": " karakters toegestaan"
"alertText2": " karakters vereist"
},
"maxSize": {
"regex": "none",
Expand Down Expand Up @@ -69,10 +69,8 @@
"alertText": "* Ongeldig telefoonnummer"
},
"email": {
// Shamelessly lifted from Scott Gonzalez via the Bassistance Validation plugin http://projects.scottsplayground.com/email_address_validation/
// Replaced incredible long regex with shorter and working one! :)
// "regex": /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i,
"regex": /^[a-z0-9]+[a-z0-9._%+-]*@(?:[a-z0-9-]+\.)+[a-z]{2,6}$/i,
// HTML5 compatible email regex ( http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html# e-mail-state-%28type=email%29 )
"regex": /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
"alertText": "* Ongeldig emailadres"
},
"integer": {
Expand Down