From 16b6de73364da02c3e305167c7fd02e9d728b530 Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Wed, 21 Feb 2018 17:10:27 +0100
Subject: [PATCH] update jquery-validation from 1.13.0 to 1.17.0
---
resources/Makefile.am | 2 +-
...min.js => jquery-validation-1.17.0.min.js} | 958 +++++++++++-------
templates/web/en/index.tt2.html | 2 +-
templates/web/fr/index.tt2.html | 2 +-
4 files changed, 604 insertions(+), 360 deletions(-)
rename resources/{jquery.validate.1.13.0.min.js => jquery-validation-1.17.0.min.js} (55%)
diff --git a/resources/Makefile.am b/resources/Makefile.am
index fd4f7da..f90adf0 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -49,7 +49,7 @@ nobase_www_DATA = \
jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png \
jquery-ui-1.12.1/jquery-ui.min.css \
jquery-ui-1.12.1/jquery-ui.min.js \
- jquery.validate.1.13.0.min.js \
+ jquery-validation-1.17.0.min.js \
presentation.html
EXTRA_DIST = $(nobase_www_DATA)
diff --git a/resources/jquery.validate.1.13.0.min.js b/resources/jquery-validation-1.17.0.min.js
similarity index 55%
rename from resources/jquery.validate.1.13.0.min.js
rename to resources/jquery-validation-1.17.0.min.js
index 3b6c812..12674b0 100644
--- a/resources/jquery.validate.1.13.0.min.js
+++ b/resources/jquery-validation-1.17.0.min.js
@@ -1,24 +1,27 @@
/*!
- * jQuery Validation Plugin v1.13.0
+ * jQuery Validation Plugin v1.17.0
*
- * http://jqueryvalidation.org/
+ * https://jqueryvalidation.org/
*
- * Copyright (c) 2014 Jörn Zaefferer
+ * Copyright (c) 2017 Jörn Zaefferer
* Released under the MIT license
*/
(function( factory ) {
if ( typeof define === "function" && define.amd ) {
define( ["jquery"], factory );
+ } else if (typeof module === "object" && module.exports) {
+ module.exports = factory( require( "jquery" ) );
} else {
factory( jQuery );
}
}(function( $ ) {
-$.extend($.fn, {
- // http://jqueryvalidation.org/validate/
+$.extend( $.fn, {
+
+ // https://jqueryvalidation.org/validate/
validate: function( options ) {
- // if nothing is selected, return nothing; can't chain anyway
+ // If nothing is selected, return nothing; can't chain anyway
if ( !this.length ) {
if ( options && options.debug && window.console ) {
console.warn( "Nothing selected, can't validate, returning nothing." );
@@ -26,7 +29,7 @@ $.extend($.fn, {
return;
}
- // check if a validator for this form was already created
+ // Check if a validator for this form was already created
var validator = $.data( this[ 0 ], "validator" );
if ( validator ) {
return validator;
@@ -40,48 +43,61 @@ $.extend($.fn, {
if ( validator.settings.onsubmit ) {
- this.validateDelegate( ":submit", "click", function( event ) {
- if ( validator.settings.submitHandler ) {
- validator.submitButton = event.target;
- }
- // allow suppressing validation by adding a cancel class to the submit button
- if ( $( event.target ).hasClass( "cancel" ) ) {
+ this.on( "click.validate", ":submit", function( event ) {
+
+ // Track the used submit button to properly handle scripted
+ // submits later.
+ validator.submitButton = event.currentTarget;
+
+ // Allow suppressing validation by adding a cancel class to the submit button
+ if ( $( this ).hasClass( "cancel" ) ) {
validator.cancelSubmit = true;
}
- // allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
- if ( $( event.target ).attr( "formnovalidate" ) !== undefined ) {
+ // Allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
+ if ( $( this ).attr( "formnovalidate" ) !== undefined ) {
validator.cancelSubmit = true;
}
- });
+ } );
- // validate the form on submit
- this.submit( function( event ) {
+ // Validate the form on submit
+ this.on( "submit.validate", function( event ) {
if ( validator.settings.debug ) {
- // prevent form submit to be able to see console output
+
+ // Prevent form submit to be able to see console output
event.preventDefault();
}
function handle() {
- var hidden;
+ var hidden, result;
+
+ // Insert a hidden input as a replacement for the missing submit button
+ // The hidden input is inserted in two cases:
+ // - A user defined a `submitHandler`
+ // - There was a pending request due to `remote` method and `stopRequest()`
+ // was called to submit the form in case it's valid
+ if ( validator.submitButton && ( validator.settings.submitHandler || validator.formSubmitted ) ) {
+ hidden = $( "<input type='hidden'/>" )
+ .attr( "name", validator.submitButton.name )
+ .val( $( validator.submitButton ).val() )
+ .appendTo( validator.currentForm );
+ }
+
if ( validator.settings.submitHandler ) {
- if ( validator.submitButton ) {
- // insert a hidden input as a replacement for the missing submit button
- hidden = $( "<input type='hidden'/>" )
- .attr( "name", validator.submitButton.name )
- .val( $( validator.submitButton ).val() )
- .appendTo( validator.currentForm );
- }
- validator.settings.submitHandler.call( validator, validator.currentForm, event );
- if ( validator.submitButton ) {
- // and clean up afterwards; thanks to no-block-scope, hidden can be referenced
+ result = validator.settings.submitHandler.call( validator, validator.currentForm, event );
+ if ( hidden ) {
+
+ // And clean up afterwards; thanks to no-block-scope, hidden can be referenced
hidden.remove();
}
+ if ( result !== undefined ) {
+ return result;
+ }
return false;
}
return true;
}
- // prevent submit for invalid forms or custom submit handlers
+ // Prevent submit for invalid forms or custom submit handlers
if ( validator.cancelSubmit ) {
validator.cancelSubmit = false;
return handle();
@@ -96,41 +112,52 @@ $.extend($.fn, {
validator.focusInvalid();
return false;
}
- });
+ } );
}
return validator;
},
- // http://jqueryvalidation.org/valid/
+
+ // https://jqueryvalidation.org/valid/
valid: function() {
- var valid, validator;
+ var valid, validator, errorList;
if ( $( this[ 0 ] ).is( "form" ) ) {
valid = this.validate().form();
} else {
+ errorList = [];
valid = true;
validator = $( this[ 0 ].form ).validate();
this.each( function() {
valid = validator.element( this ) && valid;
- });
+ if ( !valid ) {
+ errorList = errorList.concat( validator.errorList );
+ }
+ } );
+ validator.errorList = errorList;
}
return valid;
},
- // attributes: space separated list of attributes to retrieve and remove
- removeAttrs: function( attributes ) {
- var result = {},
- $element = this;
- $.each( attributes.split( /\s/ ), function( index, value ) {
- result[ value ] = $element.attr( value );
- $element.removeAttr( value );
- });
- return result;
- },
- // http://jqueryvalidation.org/rules/
+
+ // https://jqueryvalidation.org/rules/
rules: function( command, argument ) {
var element = this[ 0 ],
settings, staticRules, existingRules, data, param, filtered;
+ // If nothing is selected, return empty object; can't chain anyway
+ if ( element == null ) {
+ return;
+ }
+
+ if ( !element.form && element.hasAttribute( "contenteditable" ) ) {
+ element.form = this.closest( "form" )[ 0 ];
+ element.name = this.attr( "name" );
+ }
+
+ if ( element.form == null ) {
+ return;
+ }
+
if ( command ) {
settings = $.data( element.form, "validator" ).settings;
staticRules = settings.rules;
@@ -138,7 +165,8 @@ $.extend($.fn, {
switch ( command ) {
case "add":
$.extend( existingRules, $.validator.normalizeRule( argument ) );
- // remove messages from rules, but allow them to be set separately
+
+ // Remove messages from rules, but allow them to be set separately
delete existingRules.messages;
staticRules[ element.name ] = existingRules;
if ( argument.messages ) {
@@ -154,10 +182,7 @@ $.extend($.fn, {
$.each( argument.split( /\s/ ), function( index, method ) {
filtered[ method ] = existingRules[ method ];
delete existingRules[ method ];
- if ( method === "required" ) {
- $( element ).removeAttr( "aria-required" );
- }
- });
+ } );
return filtered;
}
}
@@ -171,49 +196,52 @@ $.extend($.fn, {
$.validator.staticRules( element )
), element );
- // make sure required is at front
+ // Make sure required is at front
if ( data.required ) {
param = data.required;
delete data.required;
data = $.extend( { required: param }, data );
- $( element ).attr( "aria-required", "true" );
}
- // make sure remote is at back
+ // Make sure remote is at back
if ( data.remote ) {
param = data.remote;
delete data.remote;
- data = $.extend( data, { remote: param });
+ data = $.extend( data, { remote: param } );
}
return data;
}
-});
+} );
// Custom selectors
-$.extend( $.expr[ ":" ], {
- // http://jqueryvalidation.org/blank-selector/
+$.extend( $.expr.pseudos || $.expr[ ":" ], { // '|| $.expr[ ":" ]' here enables backwards compatibility to jQuery 1.7. Can be removed when dropping jQ 1.7.x support
+
+ // https://jqueryvalidation.org/blank-selector/
blank: function( a ) {
return !$.trim( "" + $( a ).val() );
},
- // http://jqueryvalidation.org/filled-selector/
+
+ // https://jqueryvalidation.org/filled-selector/
filled: function( a ) {
- return !!$.trim( "" + $( a ).val() );
+ var val = $( a ).val();
+ return val !== null && !!$.trim( "" + val );
},
- // http://jqueryvalidation.org/unchecked-selector/
+
+ // https://jqueryvalidation.org/unchecked-selector/
unchecked: function( a ) {
return !$( a ).prop( "checked" );
}
-});
+} );
-// constructor for validator
+// Constructor for validator
$.validator = function( options, form ) {
this.settings = $.extend( true, {}, $.validator.defaults, options );
this.currentForm = form;
this.init();
};
-// http://jqueryvalidation.org/jQuery.validator.format/
+// https://jqueryvalidation.org/jQuery.validator.format/
$.validator.format = function( source, params ) {
if ( arguments.length === 1 ) {
return function() {
@@ -222,6 +250,9 @@ $.validator.format = function( source, params ) {
return $.validator.format.apply( this, args );
};
}
+ if ( params === undefined ) {
+ return source;
+ }
if ( arguments.length > 2 && params.constructor !== Array ) {
params = $.makeArray( arguments ).slice( 1 );
}
@@ -231,8 +262,8 @@ $.validator.format = function( source, params ) {
$.each( params, function( i, n ) {
source = source.replace( new RegExp( "\\{" + i + "\\}", "g" ), function() {
return n;
- });
- });
+ } );
+ } );
return source;
};
@@ -243,8 +274,10 @@ $.extend( $.validator, {
groups: {},
rules: {},
errorClass: "error",
+ pendingClass: "pending",
validClass: "valid",
errorElement: "label",
+ focusCleanup: false,
focusInvalid: true,
errorContainer: $( [] ),
errorLabelContainer: $( [] ),
@@ -254,8 +287,8 @@ $.extend( $.validator, {
onfocusin: function( element ) {
this.lastActive = element;
- // hide error label and remove error class on focus if enabled
- if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
+ // Hide error label and remove error class on focus if enabled
+ if ( this.settings.focusCleanup ) {
if ( this.settings.unhighlight ) {
this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
}
@@ -268,18 +301,39 @@ $.extend( $.validator, {
}
},
onkeyup: function( element, event ) {
- if ( event.which === 9 && this.elementValue( element ) === "" ) {
+
+ // Avoid revalidate the field when pressing one of the following keys
+ // Shift => 16
+ // Ctrl => 17
+ // Alt => 18
+ // Caps lock => 20
+ // End => 35
+ // Home => 36
+ // Left arrow => 37
+ // Up arrow => 38
+ // Right arrow => 39
+ // Down arrow => 40
+ // Insert => 45
+ // Num lock => 144
+ // AltGr key => 225
+ var excludedKeys = [
+ 16, 17, 18, 20, 35, 36, 37,
+ 38, 39, 40, 45, 144, 225
+ ];
+
+ if ( event.which === 9 && this.elementValue( element ) === "" || $.inArray( event.keyCode, excludedKeys ) !== -1 ) {
return;
- } else if ( element.name in this.submitted || element === this.lastElement ) {
+ } else if ( element.name in this.submitted || element.name in this.invalid ) {
this.element( element );
}
},
onclick: function( element ) {
- // click on selects, radiobuttons and checkboxes
+
+ // Click on selects, radiobuttons and checkboxes
if ( element.name in this.submitted ) {
this.element( element );
- // or option elements, check parent select in that case
+ // Or option elements, check parent select in that case
} else if ( element.parentNode.name in this.submitted ) {
this.element( element.parentNode );
}
@@ -300,7 +354,7 @@ $.extend( $.validator, {
}
},
- // http://jqueryvalidation.org/jQuery.validator.setDefaults/
+ // https://jqueryvalidation.org/jQuery.validator.setDefaults/
setDefaults: function( settings ) {
$.extend( $.validator.defaults, settings );
},
@@ -311,17 +365,17 @@ $.extend( $.validator, {
email: "Please enter a valid email address.",
url: "Please enter a valid URL.",
date: "Please enter a valid date.",
- dateISO: "Please enter a valid date ( ISO ).",
+ dateISO: "Please enter a valid date (ISO).",
number: "Please enter a valid number.",
digits: "Please enter only digits.",
- creditcard: "Please enter a valid credit card number.",
equalTo: "Please enter the same value again.",
maxlength: $.validator.format( "Please enter no more than {0} characters." ),
minlength: $.validator.format( "Please enter at least {0} characters." ),
rangelength: $.validator.format( "Please enter a value between {0} and {1} characters long." ),
range: $.validator.format( "Please enter a value between {0} and {1}." ),
max: $.validator.format( "Please enter a value less than or equal to {0}." ),
- min: $.validator.format( "Please enter a value greater than or equal to {0}." )
+ min: $.validator.format( "Please enter a value greater than or equal to {0}." ),
+ step: $.validator.format( "Please enter a multiple of {0}." )
},
autoCreateRanges: false,
@@ -347,48 +401,52 @@ $.extend( $.validator, {
}
$.each( value, function( index, name ) {
groups[ name ] = key;
- });
- });
+ } );
+ } );
rules = this.settings.rules;
$.each( rules, function( key, value ) {
rules[ key ] = $.validator.normalizeRule( value );
- });
+ } );
function delegate( event ) {
- var validator = $.data( this[ 0 ].form, "validator" ),
+
+ // Set form expando on contenteditable
+ if ( !this.form && this.hasAttribute( "contenteditable" ) ) {
+ this.form = $( this ).closest( "form" )[ 0 ];
+ this.name = $( this ).attr( "name" );
+ }
+
+ var validator = $.data( this.form, "validator" ),
eventType = "on" + event.type.replace( /^validate/, "" ),
settings = validator.settings;
- if ( settings[ eventType ] && !this.is( settings.ignore ) ) {
- settings[ eventType ].call( validator, this[ 0 ], event );
+ if ( settings[ eventType ] && !$( this ).is( settings.ignore ) ) {
+ settings[ eventType ].call( validator, this, event );
}
}
+
$( this.currentForm )
- .validateDelegate( ":text, [type='password'], [type='file'], select, textarea, " +
- "[type='number'], [type='search'] ,[type='tel'], [type='url'], " +
- "[type='email'], [type='datetime'], [type='date'], [type='month'], " +
- "[type='week'], [type='time'], [type='datetime-local'], " +
- "[type='range'], [type='color'], [type='radio'], [type='checkbox']",
- "focusin focusout keyup", delegate)
+ .on( "focusin.validate focusout.validate keyup.validate",
+ ":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], " +
+ "[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], " +
+ "[type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], " +
+ "[type='radio'], [type='checkbox'], [contenteditable], [type='button']", delegate )
+
// Support: Chrome, oldIE
// "select" is provided as event.target when clicking a option
- .validateDelegate("select, option, [type='radio'], [type='checkbox']", "click", delegate);
+ .on( "click.validate", "select, option, [type='radio'], [type='checkbox']", delegate );
if ( this.settings.invalidHandler ) {
- $( this.currentForm ).bind( "invalid-form.validate", this.settings.invalidHandler );
+ $( this.currentForm ).on( "invalid-form.validate", this.settings.invalidHandler );
}
-
- // Add aria-required to any Static/Data/Class required fields before first validation
- // Screen readers require this attribute to be present before the initial submission http://www.w3.org/TR/WCAG-TECHS/ARIA2.html
- $( this.currentForm ).find( "[required], [data-rule-required], .required" ).attr( "aria-required", "true" );
},
- // http://jqueryvalidation.org/Validator.form/
+ // https://jqueryvalidation.org/Validator.form/
form: function() {
this.checkForm();
$.extend( this.submitted, this.errorMap );
- this.invalid = $.extend({}, this.errorMap );
+ this.invalid = $.extend( {}, this.errorMap );
if ( !this.valid() ) {
- $( this.currentForm ).triggerHandler( "invalid-form", [ this ]);
+ $( this.currentForm ).triggerHandler( "invalid-form", [ this ] );
}
this.showErrors();
return this.valid();
@@ -402,13 +460,13 @@ $.extend( $.validator, {
return this.valid();
},
- // http://jqueryvalidation.org/Validator.element/
+ // https://jqueryvalidation.org/Validator.element/
element: function( element ) {
var cleanElement = this.clean( element ),
checkElement = this.validationTargetFor( cleanElement ),
- result = true;
-
- this.lastElement = checkElement;
+ v = this,
+ result = true,
+ rs, group;
if ( checkElement === undefined ) {
delete this.invalid[ cleanElement.name ];
@@ -416,40 +474,61 @@ $.extend( $.validator, {
this.prepareElement( checkElement );
this.currentElements = $( checkElement );
- result = this.check( checkElement ) !== false;
- if ( result ) {
- delete this.invalid[ checkElement.name ];
+ // If this element is grouped, then validate all group elements already
+ // containing a value
+ group = this.groups[ checkElement.name ];
+ if ( group ) {
+ $.each( this.groups, function( name, testgroup ) {
+ if ( testgroup === group && name !== checkElement.name ) {
+ cleanElement = v.validationTargetFor( v.clean( v.findByName( name ) ) );
+ if ( cleanElement && cleanElement.name in v.invalid ) {
+ v.currentElements.push( cleanElement );
+ result = v.check( cleanElement ) && result;
+ }
+ }
+ } );
+ }
+
+ rs = this.check( checkElement ) !== false;
+ result = result && rs;
+ if ( rs ) {
+ this.invalid[ checkElement.name ] = false;
} else {
this.invalid[ checkElement.name ] = true;
}
- }
- // Add aria-invalid status for screen readers
- $( element ).attr( "aria-invalid", !result );
- if ( !this.numberOfInvalids() ) {
- // Hide error containers on last error
- this.toHide = this.toHide.add( this.containers );
+ if ( !this.numberOfInvalids() ) {
+
+ // Hide error containers on last error
+ this.toHide = this.toHide.add( this.containers );
+ }
+ this.showErrors();
+
+ // Add aria-invalid status for screen readers
+ $( element ).attr( "aria-invalid", !rs );
}
- this.showErrors();
+
return result;
},
- // http://jqueryvalidation.org/Validator.showErrors/
+ // https://jqueryvalidation.org/Validator.showErrors/
showErrors: function( errors ) {
if ( errors ) {
- // add items to error list and map
+ var validator = this;
+
+ // Add items to error list and map
$.extend( this.errorMap, errors );
- this.errorList = [];
- for ( var name in errors ) {
- this.errorList.push({
- message: errors[ name ],
- element: this.findByName( name )[ 0 ]
- });
- }
- // remove items from success list
+ this.errorList = $.map( this.errorMap, function( message, name ) {
+ return {
+ message: message,
+ element: validator.findByName( name )[ 0 ]
+ };
+ } );
+
+ // Remove items from success list
this.successList = $.grep( this.successList, function( element ) {
return !( element.name in errors );
- });
+ } );
}
if ( this.settings.showErrors ) {
this.settings.showErrors.call( this, this.errorMap, this.errorList );
@@ -458,19 +537,36 @@ $.extend( $.validator, {
}
},
- // http://jqueryvalidation.org/Validator.resetForm/
+ // https://jqueryvalidation.org/Validator.resetForm/
resetForm: function() {
if ( $.fn.resetForm ) {
$( this.currentForm ).resetForm();
}
+ this.invalid = {};
this.submitted = {};
- this.lastElement = null;
this.prepareForm();
this.hideErrors();
- this.elements()
+ var elements = this.elements()
+ .removeData( "previousValue" )
+ .removeAttr( "aria-invalid" );
+
+ this.resetElements( elements );
+ },
+
+ resetElements: function( elements ) {
+ var i;
+
+ if ( this.settings.unhighlight ) {
+ for ( i = 0; elements[ i ]; i++ ) {
+ this.settings.unhighlight.call( this, elements[ i ],
+ this.settings.errorClass, "" );
+ this.findByName( elements[ i ].name ).removeClass( this.settings.validClass );
+ }
+ } else {
+ elements
.removeClass( this.settings.errorClass )
- .removeData( "previousValue" )
- .removeAttr( "aria-invalid" );
+ .removeClass( this.settings.validClass );
+ }
},
numberOfInvalids: function() {
@@ -482,7 +578,12 @@ $.extend( $.validator, {
var count = 0,
i;
for ( i in obj ) {
- count++;
+
+ // This check allows counting elements with empty error
+ // message as invalid elements
+ if ( obj[ i ] !== undefined && obj[ i ] !== null && obj[ i ] !== false ) {
+ count++;
+ }
}
return count;
},
@@ -507,13 +608,15 @@ $.extend( $.validator, {
focusInvalid: function() {
if ( this.settings.focusInvalid ) {
try {
- $( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || [])
+ $( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || [] )
.filter( ":visible" )
.focus()
- // manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
+
+ // Manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
.trigger( "focusin" );
} catch ( e ) {
- // ignore IE throwing errors when focusing hidden elements
+
+ // Ignore IE throwing errors when focusing hidden elements
}
}
},
@@ -522,31 +625,38 @@ $.extend( $.validator, {
var lastActive = this.lastActive;
return lastActive && $.grep( this.errorList, function( n ) {
return n.element.name === lastActive.name;
- }).length === 1 && lastActive;
+ } ).length === 1 && lastActive;
},
elements: function() {
var validator = this,
rulesCache = {};
- // select all valid inputs inside the form (no submit or reset buttons)
+ // Select all valid inputs inside the form (no submit or reset buttons)
return $( this.currentForm )
- .find( "input, select, textarea" )
- .not( ":submit, :reset, :image, [disabled]" )
+ .find( "input, select, textarea, [contenteditable]" )
+ .not( ":submit, :reset, :image, :disabled" )
.not( this.settings.ignore )
.filter( function() {
- if ( !this.name && validator.settings.debug && window.console ) {
+ var name = this.name || $( this ).attr( "name" ); // For contenteditable
+ if ( !name && validator.settings.debug && window.console ) {
console.error( "%o has no name assigned", this );
}
- // select only the first element for each name, and only those with rules specified
- if ( this.name in rulesCache || !validator.objectLength( $( this ).rules() ) ) {
+ // Set form expando on contenteditable
+ if ( this.hasAttribute( "contenteditable" ) ) {
+ this.form = $( this ).closest( "form" )[ 0 ];
+ this.name = name;
+ }
+
+ // Select only the first element for each name, and only those with rules specified
+ if ( name in rulesCache || !validator.objectLength( $( this ).rules() ) ) {
return false;
}
- rulesCache[ this.name ] = true;
+ rulesCache[ name ] = true;
return true;
- });
+ } );
},
clean: function( selector ) {
@@ -558,12 +668,16 @@ $.extend( $.validator, {
return $( this.settings.errorElement + "." + errorClass, this.errorContext );
},
- reset: function() {
+ resetInternals: function() {
this.successList = [];
this.errorList = [];
this.errorMap = {};
this.toShow = $( [] );
this.toHide = $( [] );
+ },
+
+ reset: function() {
+ this.resetInternals();
this.currentElements = $( [] );
},
@@ -578,19 +692,48 @@ $.extend( $.validator, {
},
elementValue: function( element ) {
- var val,
- $element = $( element ),
- type = element.type;
+ var $element = $( element ),
+ type = element.type,
+ val, idx;
if ( type === "radio" || type === "checkbox" ) {
- return $( "input[name='" + element.name + "']:checked" ).val();
+ return this.findByName( element.name ).filter( ":checked" ).val();
} else if ( type === "number" && typeof element.validity !== "undefined" ) {
- return element.validity.badInput ? false : $element.val();
+ return element.validity.badInput ? "NaN" : $element.val();
+ }
+
+ if ( element.hasAttribute( "contenteditable" ) ) {
+ val = $element.text();
+ } else {
+ val = $element.val();
+ }
+
+ if ( type === "file" ) {
+
+ // Modern browser (chrome & safari)
+ if ( val.substr( 0, 12 ) === "C:\\fakepath\\" ) {
+ return val.substr( 12 );
+ }
+
+ // Legacy browsers
+ // Unix-based path
+ idx = val.lastIndexOf( "/" );
+ if ( idx >= 0 ) {
+ return val.substr( idx + 1 );
+ }
+
+ // Windows-based path
+ idx = val.lastIndexOf( "\\" );
+ if ( idx >= 0 ) {
+ return val.substr( idx + 1 );
+ }
+
+ // Just the file name
+ return val;
}
- val = $element.val();
if ( typeof val === "string" ) {
- return val.replace(/\r/g, "" );
+ return val.replace( /\r/g, "" );
}
return val;
},
@@ -601,18 +744,39 @@ $.extend( $.validator, {
var rules = $( element ).rules(),
rulesCount = $.map( rules, function( n, i ) {
return i;
- }).length,
+ } ).length,
dependencyMismatch = false,
val = this.elementValue( element ),
- result, method, rule;
+ result, method, rule, normalizer;
+
+ // Prioritize the local normalizer defined for this element over the global one
+ // if the former exists, otherwise user the global one in case it exists.
+ if ( typeof rules.normalizer === "function" ) {
+ normalizer = rules.normalizer;
+ } else if ( typeof this.settings.normalizer === "function" ) {
+ normalizer = this.settings.normalizer;
+ }
+
+ // If normalizer is defined, then call it to retreive the changed value instead
+ // of using the real one.
+ // Note that `this` in the normalizer is `element`.
+ if ( normalizer ) {
+ val = normalizer.call( element, val );
+
+ if ( typeof val !== "string" ) {
+ throw new TypeError( "The normalizer should return a string value." );
+ }
+
+ // Delete the normalizer from rules to avoid treating it as a pre-defined method.
+ delete rules.normalizer;
+ }
for ( method in rules ) {
rule = { method: method, parameters: rules[ method ] };
try {
-
result = $.validator.methods[ method ].call( this, val, element, rule.parameters );
- // if a method indicates that the field is optional and therefore valid,
+ // If a method indicates that the field is optional and therefore valid,
// don't mark it as valid when there are no other rules
if ( result === "dependency-mismatch" && rulesCount === 1 ) {
dependencyMismatch = true;
@@ -633,6 +797,10 @@ $.extend( $.validator, {
if ( this.settings.debug && window.console ) {
console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
}
+ if ( e instanceof TypeError ) {
+ e.message += ". Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.";
+ }
+
throw e;
}
}
@@ -645,7 +813,7 @@ $.extend( $.validator, {
return true;
},
- // return the custom message for the given element and validation method
+ // Return the custom message for the given element and validation method
// specified in the element's HTML5 data attribute
// return the generic message if present and no method specific message is present
customDataMessage: function( element, method ) {
@@ -653,15 +821,15 @@ $.extend( $.validator, {
method.substring( 1 ).toLowerCase() ) || $( element ).data( "msg" );
},
- // return the custom message for the given element name and validation method
+ // Return the custom message for the given element name and validation method
customMessage: function( name, method ) {
var m = this.settings.messages[ name ];
- return m && ( m.constructor === String ? m : m[ method ]);
+ return m && ( m.constructor === String ? m : m[ method ] );
},
- // return the first defined argument, allowing empty strings
+ // Return the first defined argument, allowing empty strings
findDefined: function() {
- for ( var i = 0; i < arguments.length; i++) {
+ for ( var i = 0; i < arguments.length; i++ ) {
if ( arguments[ i ] !== undefined ) {
return arguments[ i ];
}
@@ -669,30 +837,47 @@ $.extend( $.validator, {
return undefined;
},
- defaultMessage: function( element, method ) {
- return this.findDefined(
- this.customMessage( element.name, method ),
- this.customDataMessage( element, method ),
- // title is never undefined, so handle empty string as undefined
- !this.settings.ignoreTitle && element.title || undefined,
- $.validator.messages[ method ],
- "<strong>Warning: No message defined for " + element.name + "</strong>"
- );
- },
-
- formatAndAdd: function( element, rule ) {
- var message = this.defaultMessage( element, rule.method ),
+ // The second parameter 'rule' used to be a string, and extended to an object literal
+ // of the following form:
+ // rule = {
+ // method: "method name",
+ // parameters: "the given method parameters"
+ // }
+ //
+ // The old behavior still supported, kept to maintain backward compatibility with
+ // old code, and will be removed in the next major release.
+ defaultMessage: function( element, rule ) {
+ if ( typeof rule === "string" ) {
+ rule = { method: rule };
+ }
+
+ var message = this.findDefined(
+ this.customMessage( element.name, rule.method ),
+ this.customDataMessage( element, rule.method ),
+
+ // 'title' is never undefined, so handle empty string as undefined
+ !this.settings.ignoreTitle && element.title || undefined,
+ $.validator.messages[ rule.method ],
+ "<strong>Warning: No message defined for " + element.name + "</strong>"
+ ),
theregex = /\$?\{(\d+)\}/g;
if ( typeof message === "function" ) {
message = message.call( this, rule.parameters, element );
} else if ( theregex.test( message ) ) {
message = $.validator.format( message.replace( theregex, "{$1}" ), rule.parameters );
}
- this.errorList.push({
+
+ return message;
+ },
+
+ formatAndAdd: function( element, rule ) {
+ var message = this.defaultMessage( element, rule );
+
+ this.errorList.push( {
message: message,
element: element,
method: rule.method
- });
+ } );
this.errorMap[ element.name ] = message;
this.submitted[ element.name ] = message;
@@ -737,23 +922,27 @@ $.extend( $.validator, {
},
invalidElements: function() {
- return $( this.errorList ).map(function() {
+ return $( this.errorList ).map( function() {
return this.element;
- });
+ } );
},
showLabel: function( element, message ) {
- var place, group, errorID,
+ var place, group, errorID, v,
error = this.errorsFor( element ),
elementID = this.idOrName( element ),
describedBy = $( element ).attr( "aria-describedby" );
+
if ( error.length ) {
- // refresh error/success class
+
+ // Refresh error/success class
error.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
- // replace message on existing label
+
+ // Replace message on existing label
error.html( message );
} else {
- // create error element
+
+ // Create error element
error = $( "<" + this.settings.errorElement + ">" )
.attr( "id", elementID + "-error" )
.addClass( this.settings.errorClass )
@@ -762,31 +951,35 @@ $.extend( $.validator, {
// Maintain reference to the element to be placed into the DOM
place = error;
if ( this.settings.wrapper ) {
- // make sure the element is visible, even in IE
+
+ // Make sure the element is visible, even in IE
// actually showing the wrapped element is handled elsewhere
place = error.hide().show().wrap( "<" + this.settings.wrapper + "/>" ).parent();
}
if ( this.labelContainer.length ) {
this.labelContainer.append( place );
} else if ( this.settings.errorPlacement ) {
- this.settings.errorPlacement( place, $( element ) );
+ this.settings.errorPlacement.call( this, place, $( element ) );
} else {
place.insertAfter( element );
}
// Link error back to the element
if ( error.is( "label" ) ) {
+
// If the error is a label, then associate using 'for'
error.attr( "for", elementID );
- } else if ( error.parents( "label[for='" + elementID + "']" ).length === 0 ) {
+
// If the element is not a child of an associated label, then it's necessary
// to explicitly apply aria-describedby
-
+ } else if ( error.parents( "label[for='" + this.escapeCssMeta( elementID ) + "']" ).length === 0 ) {
errorID = error.attr( "id" );
+
// Respect existing non-error aria-describedby
if ( !describedBy ) {
describedBy = errorID;
- } else if ( !describedBy.match( new RegExp( "\b" + errorID + "\b" ) ) ) {
+ } else if ( !describedBy.match( new RegExp( "\\b" + this.escapeCssMeta( errorID ) + "\\b" ) ) ) {
+
// Add to end of list if not already present
describedBy += " " + errorID;
}
@@ -795,12 +988,13 @@ $.extend( $.validator, {
// If this element is grouped, then assign to all elements in the same group
group = this.groups[ element.name ];
if ( group ) {
- $.each( this.groups, function( name, testgroup ) {
+ v = this;
+ $.each( v.groups, function( name, testgroup ) {
if ( testgroup === group ) {
- $( "[name='" + name + "']", this.currentForm )
+ $( "[name='" + v.escapeCssMeta( name ) + "']", v.currentForm )
.attr( "aria-describedby", error.attr( "id" ) );
}
- });
+ } );
}
}
}
@@ -816,28 +1010,41 @@ $.extend( $.validator, {
},
errorsFor: function( element ) {
- var name = this.idOrName( element ),
+ var name = this.escapeCssMeta( this.idOrName( element ) ),
describer = $( element ).attr( "aria-describedby" ),
selector = "label[for='" + name + "'], label[for='" + name + "'] *";
- // aria-describedby should directly reference the error element
+
+ // 'aria-describedby' should directly reference the error element
if ( describer ) {
- selector = selector + ", #" + describer.replace( /\s+/g, ", #" );
+ selector = selector + ", #" + this.escapeCssMeta( describer )
+ .replace( /\s+/g, ", #" );
}
+
return this
.errors()
.filter( selector );
},
+ // See https://api.jquery.com/category/selectors/, for CSS
+ // meta-characters that should be escaped in order to be used with JQuery
+ // as a literal part of a name/id or any selector.
+ escapeCssMeta: function( string ) {
+ return string.replace( /([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g, "\\$1" );
+ },
+
idOrName: function( element ) {
return this.groups[ element.name ] || ( this.checkable( element ) ? element.name : element.id || element.name );
},
validationTargetFor: function( element ) {
- // if radio/checkbox, validate first element in group instead
+
+ // If radio/checkbox, validate first element in group instead
if ( this.checkable( element ) ) {
- element = this.findByName( element.name ).not( this.settings.ignore )[ 0 ];
+ element = this.findByName( element.name );
}
- return element;
+
+ // Always apply ignore filter
+ return $( element ).not( this.settings.ignore )[ 0 ];
},
checkable: function( element ) {
@@ -845,7 +1052,7 @@ $.extend( $.validator, {
},
findByName: function( name ) {
- return $( this.currentForm ).find( "[name='" + name + "']" );
+ return $( this.currentForm ).find( "[name='" + this.escapeCssMeta( name ) + "']" );
},
getLength: function( value, element ) {
@@ -861,7 +1068,7 @@ $.extend( $.validator, {
},
depend: function( param, element ) {
- return this.dependTypes[typeof param] ? this.dependTypes[typeof param]( param, element ) : true;
+ return this.dependTypes[ typeof param ] ? this.dependTypes[ typeof param ]( param, element ) : true;
},
dependTypes: {
@@ -884,32 +1091,58 @@ $.extend( $.validator, {
startRequest: function( element ) {
if ( !this.pending[ element.name ] ) {
this.pendingRequest++;
+ $( element ).addClass( this.settings.pendingClass );
this.pending[ element.name ] = true;
}
},
stopRequest: function( element, valid ) {
this.pendingRequest--;
- // sometimes synchronization fails, make sure pendingRequest is never < 0
+
+ // Sometimes synchronization fails, make sure pendingRequest is never < 0
if ( this.pendingRequest < 0 ) {
this.pendingRequest = 0;
}
delete this.pending[ element.name ];
+ $( element ).removeClass( this.settings.pendingClass );
if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
$( this.currentForm ).submit();
+
+ // Remove the hidden input that was used as a replacement for the
+ // missing submit button. The hidden input is added by `handle()`
+ // to ensure that the value of the used submit button is passed on
+ // for scripted submits triggered by this method
+ if ( this.submitButton ) {
+ $( "input:hidden[name='" + this.submitButton.name + "']", this.currentForm ).remove();
+ }
+
this.formSubmitted = false;
- } else if (!valid && this.pendingRequest === 0 && this.formSubmitted ) {
- $( this.currentForm ).triggerHandler( "invalid-form", [ this ]);
+ } else if ( !valid && this.pendingRequest === 0 && this.formSubmitted ) {
+ $( this.currentForm ).triggerHandler( "invalid-form", [ this ] );
this.formSubmitted = false;
}
},
- previousValue: function( element ) {
+ previousValue: function( element, method ) {
+ method = typeof method === "string" && method || "remote";
+
return $.data( element, "previousValue" ) || $.data( element, "previousValue", {
old: null,
valid: true,
- message: this.defaultMessage( element, "remote" )
- });
+ message: this.defaultMessage( element, { method: method } )
+ } );
+ },
+
+ // Cleans up all forms and elements, removes validator-specific events
+ destroy: function() {
+ this.resetForm();
+
+ $( this.currentForm )
+ .off( ".validate" )
+ .removeData( "validator" )
+ .find( ".validate-equalTo-blur" )
+ .off( ".validate-equalTo" )
+ .removeClass( "validate-equalTo-blur" );
}
},
@@ -940,13 +1173,36 @@ $.extend( $.validator, {
if ( classes ) {
$.each( classes.split( " " ), function() {
if ( this in $.validator.classRuleSettings ) {
- $.extend( rules, $.validator.classRuleSettings[ this ]);
+ $.extend( rules, $.validator.classRuleSettings[ this ] );
}
- });
+ } );
}
return rules;
},
+ normalizeAttributeRule: function( rules, type, method, value ) {
+
+ // Convert the value to a number for number inputs, and for text for backwards compability
+ // allows type="date" and others to be compared as strings
+ if ( /min|max|step/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
+ value = Number( value );
+
+ // Support Opera Mini, which returns NaN for undefined minlength
+ if ( isNaN( value ) ) {
+ value = undefined;
+ }
+ }
+
+ if ( value || value === 0 ) {
+ rules[ method ] = value;
+ } else if ( type === method && type !== "range" ) {
+
+ // Exception: the jquery validate 'range' method
+ // does not test for the html5 'range' type
+ rules[ method ] = true;
+ }
+ },
+
attributeRules: function( element ) {
var rules = {},
$element = $( element ),
@@ -955,36 +1211,26 @@ $.extend( $.validator, {
for ( method in $.validator.methods ) {
- // support for <input required> in both html5 and older browsers
+ // Support for <input required> in both html5 and older browsers
if ( method === "required" ) {
value = element.getAttribute( method );
+
// Some browsers return an empty string for the required attribute
// and non-HTML5 browsers might have required="" markup
if ( value === "" ) {
value = true;
}
- // force non-HTML5 browsers to return bool
+
+ // Force non-HTML5 browsers to return bool
value = !!value;
} else {
value = $element.attr( method );
}
- // convert the value to a number for number inputs, and for text for backwards compability
- // allows type="date" and others to be compared as strings
- if ( /min|max/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
- value = Number( value );
- }
-
- if ( value || value === 0 ) {
- rules[ method ] = value;
- } else if ( type === method && type !== "range" ) {
- // exception: the jquery validate 'range' method
- // does not test for the html5 'range' type
- rules[ method ] = true;
- }
+ this.normalizeAttributeRule( rules, type, method, value );
}
- // maxlength may be returned as -1, 2147483647 ( IE ) and 524288 ( safari ) for text inputs
+ // 'maxlength' may be returned as -1, 2147483647 ( IE ) and 524288 ( safari ) for text inputs
if ( rules.maxlength && /-1|2147483647|524288/.test( rules.maxlength ) ) {
delete rules.maxlength;
}
@@ -993,13 +1239,14 @@ $.extend( $.validator, {
},
dataRules: function( element ) {
- var method, value,
- rules = {}, $element = $( element );
+ var rules = {},
+ $element = $( element ),
+ type = element.getAttribute( "type" ),
+ method, value;
+
for ( method in $.validator.methods ) {
value = $element.data( "rule" + method.charAt( 0 ).toUpperCase() + method.substring( 1 ).toLowerCase() );
- if ( value !== undefined ) {
- rules[ method ] = value;
- }
+ this.normalizeAttributeRule( rules, type, method, value );
}
return rules;
},
@@ -1015,9 +1262,11 @@ $.extend( $.validator, {
},
normalizeRules: function( rules, element ) {
- // handle dependency check
+
+ // Handle dependency check
$.each( rules, function( prop, val ) {
- // ignore rule when param is explicitly false, eg. required:false
+
+ // Ignore rule when param is explicitly false, eg. required:false
if ( val === false ) {
delete rules[ prop ];
return;
@@ -1035,42 +1284,44 @@ $.extend( $.validator, {
if ( keepRule ) {
rules[ prop ] = val.param !== undefined ? val.param : true;
} else {
+ $.data( element.form, "validator" ).resetElements( $( element ) );
delete rules[ prop ];
}
}
- });
+ } );
- // evaluate parameters
+ // Evaluate parameters
$.each( rules, function( rule, parameter ) {
- rules[ rule ] = $.isFunction( parameter ) ? parameter( element ) : parameter;
- });
+ rules[ rule ] = $.isFunction( parameter ) && rule !== "normalizer" ? parameter( element ) : parameter;
+ } );
- // clean number parameters
- $.each([ "minlength", "maxlength" ], function() {
+ // Clean number parameters
+ $.each( [ "minlength", "maxlength" ], function() {
if ( rules[ this ] ) {
rules[ this ] = Number( rules[ this ] );
}
- });
- $.each([ "rangelength", "range" ], function() {
+ } );
+ $.each( [ "rangelength", "range" ], function() {
var parts;
if ( rules[ this ] ) {
if ( $.isArray( rules[ this ] ) ) {
- rules[ this ] = [ Number( rules[ this ][ 0 ]), Number( rules[ this ][ 1 ] ) ];
+ rules[ this ] = [ Number( rules[ this ][ 0 ] ), Number( rules[ this ][ 1 ] ) ];
} else if ( typeof rules[ this ] === "string" ) {
- parts = rules[ this ].replace(/[\[\]]/g, "" ).split( /[\s,]+/ );
- rules[ this ] = [ Number( parts[ 0 ]), Number( parts[ 1 ] ) ];
+ parts = rules[ this ].replace( /[\[\]]/g, "" ).split( /[\s,]+/ );
+ rules[ this ] = [ Number( parts[ 0 ] ), Number( parts[ 1 ] ) ];
}
}
- });
+ } );
if ( $.validator.autoCreateRanges ) {
- // auto-create ranges
- if ( rules.min && rules.max ) {
+
+ // Auto-create ranges
+ if ( rules.min != null && rules.max != null ) {
rules.range = [ rules.min, rules.max ];
delete rules.min;
delete rules.max;
}
- if ( rules.minlength && rules.maxlength ) {
+ if ( rules.minlength != null && rules.maxlength != null ) {
rules.rangelength = [ rules.minlength, rules.maxlength ];
delete rules.minlength;
delete rules.maxlength;
@@ -1086,13 +1337,13 @@ $.extend( $.validator, {
var transformed = {};
$.each( data.split( /\s/ ), function() {
transformed[ this ] = true;
- });
+ } );
data = transformed;
}
return data;
},
- // http://jqueryvalidation.org/jQuery.validator.addMethod/
+ // https://jqueryvalidation.org/jQuery.validator.addMethod/
addMethod: function( name, method, message ) {
$.validator.methods[ name ] = method;
$.validator.messages[ name ] = message !== undefined ? message : $.validator.messages[ name ];
@@ -1101,172 +1352,181 @@ $.extend( $.validator, {
}
},
+ // https://jqueryvalidation.org/jQuery.validator.methods/
methods: {
- // http://jqueryvalidation.org/required-method/
+ // https://jqueryvalidation.org/required-method/
required: function( value, element, param ) {
- // check if dependency is met
+
+ // Check if dependency is met
if ( !this.depend( param, element ) ) {
return "dependency-mismatch";
}
if ( element.nodeName.toLowerCase() === "select" ) {
- // could be an array for select-multiple or a string, both are fine this way
+
+ // Could be an array for select-multiple or a string, both are fine this way
var val = $( element ).val();
return val && val.length > 0;
}
if ( this.checkable( element ) ) {
return this.getLength( value, element ) > 0;
}
- return $.trim( value ).length > 0;
+ return value.length > 0;
},
- // http://jqueryvalidation.org/email-method/
+ // https://jqueryvalidation.org/email-method/
email: function( value, element ) {
- // From http://www.whatwg.org/specs/web-apps/current-work/multipage/states-of-the-type-attribute.html#e-mail-state-%28type=email%29
+
+ // From https://html.spec.whatwg.org/multipage/forms.html#valid-e-mail-address
// Retrieved 2014-01-14
// If you have a problem with this implementation, report a bug against the above spec
// Or use custom methods to implement your own email validation
return this.optional( element ) || /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test( value );
},
- // http://jqueryvalidation.org/url-method/
+ // https://jqueryvalidation.org/url-method/
url: function( value, element ) {
- // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
- return this.optional( element ) || /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([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])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test( value );
+
+ // Copyright (c) 2010-2013 Diego Perini, MIT licensed
+ // https://gist.github.com/dperini/729294
+ // see also https://mathiasbynens.be/demo/url-regex
+ // modified to allow protocol-relative URLs
+ return this.optional( element ) || /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test( value );
},
- // http://jqueryvalidation.org/date-method/
+ // https://jqueryvalidation.org/date-method/
date: function( value, element ) {
return this.optional( element ) || !/Invalid|NaN/.test( new Date( value ).toString() );
},
- // http://jqueryvalidation.org/dateISO-method/
+ // https://jqueryvalidation.org/dateISO-method/
dateISO: function( value, element ) {
return this.optional( element ) || /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test( value );
},
- // http://jqueryvalidation.org/number-method/
+ // https://jqueryvalidation.org/number-method/
number: function( value, element ) {
- return this.optional( element ) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
+ return this.optional( element ) || /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test( value );
},
- // http://jqueryvalidation.org/digits-method/
+ // https://jqueryvalidation.org/digits-method/
digits: function( value, element ) {
return this.optional( element ) || /^\d+$/.test( value );
},
- // http://jqueryvalidation.org/creditcard-method/
- // based on http://en.wikipedia.org/wiki/Luhn/
- creditcard: function( value, element ) {
- if ( this.optional( element ) ) {
- return "dependency-mismatch";
- }
- // accept only spaces, digits and dashes
- if ( /[^0-9 \-]+/.test( value ) ) {
- return false;
- }
- var nCheck = 0,
- nDigit = 0,
- bEven = false,
- n, cDigit;
-
- value = value.replace( /\D/g, "" );
-
- // Basing min and max length on
- // http://developer.ean.com/general_info/Valid_Credit_Card_Types
- if ( value.length < 13 || value.length > 19 ) {
- return false;
- }
-
- for ( n = value.length - 1; n >= 0; n--) {
- cDigit = value.charAt( n );
- nDigit = parseInt( cDigit, 10 );
- if ( bEven ) {
- if ( ( nDigit *= 2 ) > 9 ) {
- nDigit -= 9;
- }
- }
- nCheck += nDigit;
- bEven = !bEven;
- }
-
- return ( nCheck % 10 ) === 0;
- },
-
- // http://jqueryvalidation.org/minlength-method/
+ // https://jqueryvalidation.org/minlength-method/
minlength: function( value, element, param ) {
- var length = $.isArray( value ) ? value.length : this.getLength( $.trim( value ), element );
+ var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || length >= param;
},
- // http://jqueryvalidation.org/maxlength-method/
+ // https://jqueryvalidation.org/maxlength-method/
maxlength: function( value, element, param ) {
- var length = $.isArray( value ) ? value.length : this.getLength( $.trim( value ), element );
+ var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || length <= param;
},
- // http://jqueryvalidation.org/rangelength-method/
+ // https://jqueryvalidation.org/rangelength-method/
rangelength: function( value, element, param ) {
- var length = $.isArray( value ) ? value.length : this.getLength( $.trim( value ), element );
+ var length = $.isArray( value ) ? value.length : this.getLength( value, element );
return this.optional( element ) || ( length >= param[ 0 ] && length <= param[ 1 ] );
},
- // http://jqueryvalidation.org/min-method/
+ // https://jqueryvalidation.org/min-method/
min: function( value, element, param ) {
return this.optional( element ) || value >= param;
},
- // http://jqueryvalidation.org/max-method/
+ // https://jqueryvalidation.org/max-method/
max: function( value, element, param ) {
return this.optional( element ) || value <= param;
},
- // http://jqueryvalidation.org/range-method/
+ // https://jqueryvalidation.org/range-method/
range: function( value, element, param ) {
return this.optional( element ) || ( value >= param[ 0 ] && value <= param[ 1 ] );
},
- // http://jqueryvalidation.org/equalTo-method/
+ // https://jqueryvalidation.org/step-method/
+ step: function( value, element, param ) {
+ var type = $( element ).attr( "type" ),
+ errorMessage = "Step attribute on input type " + type + " is not supported.",
+ supportedTypes = [ "text", "number", "range" ],
+ re = new RegExp( "\\b" + type + "\\b" ),
+ notSupported = type && !re.test( supportedTypes.join() ),
+ decimalPlaces = function( num ) {
+ var match = ( "" + num ).match( /(?:\.(\d+))?$/ );
+ if ( !match ) {
+ return 0;
+ }
+
+ // Number of digits right of decimal point.
+ return match[ 1 ] ? match[ 1 ].length : 0;
+ },
+ toInt = function( num ) {
+ return Math.round( num * Math.pow( 10, decimals ) );
+ },
+ valid = true,
+ decimals;
+
+ // Works only for text, number and range input types
+ // TODO find a way to support input types date, datetime, datetime-local, month, time and week
+ if ( notSupported ) {
+ throw new Error( errorMessage );
+ }
+
+ decimals = decimalPlaces( param );
+
+ // Value can't have too many decimals
+ if ( decimalPlaces( value ) > decimals || toInt( value ) % toInt( param ) !== 0 ) {
+ valid = false;
+ }
+
+ return this.optional( element ) || valid;
+ },
+
+ // https://jqueryvalidation.org/equalTo-method/
equalTo: function( value, element, param ) {
- // bind to the blur event of the target in order to revalidate whenever the target field is updated
- // TODO find a way to bind the event just once, avoiding the unbind-rebind overhead
+
+ // Bind to the blur event of the target in order to revalidate whenever the target field is updated
var target = $( param );
- if ( this.settings.onfocusout ) {
- target.unbind( ".validate-equalTo" ).bind( "blur.validate-equalTo", function() {
+ if ( this.settings.onfocusout && target.not( ".validate-equalTo-blur" ).length ) {
+ target.addClass( "validate-equalTo-blur" ).on( "blur.validate-equalTo", function() {
$( element ).valid();
- });
+ } );
}
return value === target.val();
},
- // http://jqueryvalidation.org/remote-method/
- remote: function( value, element, param ) {
+ // https://jqueryvalidation.org/remote-method/
+ remote: function( value, element, param, method ) {
if ( this.optional( element ) ) {
return "dependency-mismatch";
}
- var previous = this.previousValue( element ),
- validator, data;
+ method = typeof method === "string" && method || "remote";
+
+ var previous = this.previousValue( element, method ),
+ validator, data, optionDataString;
- if (!this.settings.messages[ element.name ] ) {
+ if ( !this.settings.messages[ element.name ] ) {
this.settings.messages[ element.name ] = {};
}
- previous.originalMessage = this.settings.messages[ element.name ].remote;
- this.settings.messages[ element.name ].remote = previous.message;
+ previous.originalMessage = previous.originalMessage || this.settings.messages[ element.name ][ method ];
+ this.settings.messages[ element.name ][ method ] = previous.message;
param = typeof param === "string" && { url: param } || param;
-
- if ( previous.old === value ) {
+ optionDataString = $.param( $.extend( { data: value }, param.data ) );
+ if ( previous.old === optionDataString ) {
return previous.valid;
}
- previous.old = value;
+ previous.old = optionDataString;
validator = this;
this.startRequest( element );
data = {};
data[ element.name ] = value;
$.ajax( $.extend( true, {
- url: param,
mode: "abort",
port: "validate" + element.name,
dataType: "json",
@@ -1276,18 +1536,19 @@ $.extend( $.validator, {
var valid = response === true || response === "true",
errors, message, submitted;
- validator.settings.messages[ element.name ].remote = previous.originalMessage;
+ validator.settings.messages[ element.name ][ method ] = previous.originalMessage;
if ( valid ) {
submitted = validator.formSubmitted;
- validator.prepareElement( element );
+ validator.resetInternals();
+ validator.toHide = validator.errorsFor( element );
validator.formSubmitted = submitted;
validator.successList.push( element );
- delete validator.invalid[ element.name ];
+ validator.invalid[ element.name ] = false;
validator.showErrors();
} else {
errors = {};
- message = response || validator.defaultMessage( element, "remote" );
- errors[ element.name ] = previous.message = $.isFunction( message ) ? message( value ) : message;
+ message = response || validator.defaultMessage( element, { method: method, parameters: value } );
+ errors[ element.name ] = previous.message = message;
validator.invalid[ element.name ] = true;
validator.showErrors( errors );
}
@@ -1297,61 +1558,44 @@ $.extend( $.validator, {
}, param ) );
return "pending";
}
-
}
-});
-
-$.format = function deprecated() {
- throw "$.format has been deprecated. Please use $.validator.format instead.";
-};
+} );
-// ajax mode: abort
+// Ajax mode: abort
// usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
var pendingRequests = {},
ajax;
+
// Use a prefilter if available (1.5+)
if ( $.ajaxPrefilter ) {
- $.ajaxPrefilter(function( settings, _, xhr ) {
+ $.ajaxPrefilter( function( settings, _, xhr ) {
var port = settings.port;
if ( settings.mode === "abort" ) {
- if ( pendingRequests[port] ) {
- pendingRequests[port].abort();
+ if ( pendingRequests[ port ] ) {
+ pendingRequests[ port ].abort();
}
- pendingRequests[port] = xhr;
+ pendingRequests[ port ] = xhr;
}
- });
+ } );
} else {
+
// Proxy ajax
ajax = $.ajax;
$.ajax = function( settings ) {
var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
port = ( "port" in settings ? settings : $.ajaxSettings ).port;
if ( mode === "abort" ) {
- if ( pendingRequests[port] ) {
- pendingRequests[port].abort();
+ if ( pendingRequests[ port ] ) {
+ pendingRequests[ port ].abort();
}
- pendingRequests[port] = ajax.apply(this, arguments);
- return pendingRequests[port];
+ pendingRequests[ port ] = ajax.apply( this, arguments );
+ return pendingRequests[ port ];
}
- return ajax.apply(this, arguments);
+ return ajax.apply( this, arguments );
};
}
-
-// provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
-// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
-
-$.extend($.fn, {
- validateDelegate: function( delegate, type, handler ) {
- return this.bind(type, function( event ) {
- var target = $(event.target);
- if ( target.is(delegate) ) {
- return handler.apply(target, arguments);
- }
- });
- }
-});
-
+return $;
}));
\ No newline at end of file
diff --git a/templates/web/en/index.tt2.html b/templates/web/en/index.tt2.html
index f98c001..b641a46 100644
--- a/templates/web/en/index.tt2.html
+++ b/templates/web/en/index.tt2.html
@@ -17,7 +17,7 @@
<script type="text/javascript" src="jquery-cookie-1.4.1.min.js"></script>
<script type="text/javascript" src="jquery-steps-1.1.0/jquery-steps.min.js"></script>
<script type="text/javascript" src="jquery-ui-1.12.1/jquery-ui.min.js"></script>
- <script type="text/javascript" src="jquery.validate.1.13.0.min.js"></script>
+ <script type="text/javascript" src="jquery-validation-1.17.0.min.js"></script>
<script type="text/javascript" src="account-manager.js"></script>
<title>[% app.name %]</title>
diff --git a/templates/web/fr/index.tt2.html b/templates/web/fr/index.tt2.html
index 8f5bfab..917b84f 100644
--- a/templates/web/fr/index.tt2.html
+++ b/templates/web/fr/index.tt2.html
@@ -17,7 +17,7 @@
<script type="text/javascript" src="jquery-cookie-1.4.1.min.js"></script>
<script type="text/javascript" src="jquery-steps-1.1.0/jquery-steps.min.js"></script>
<script type="text/javascript" src="jquery-ui-1.12.1/jquery-ui.min.js"></script>
- <script type="text/javascript" src="jquery.validate.1.13.0.min.js"></script>
+ <script type="text/javascript" src="jquery-validation-1.17.0.min.js"></script>
<script type="text/javascript" src="account-manager.js"></script>
<title>[% app.name %]</title>
--
GitLab