summaryrefslogtreecommitdiffstats
path: root/samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js
diff options
context:
space:
mode:
Diffstat (limited to 'samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js')
-rw-r--r--samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js855
1 files changed, 450 insertions, 405 deletions
diff --git a/samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js b/samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js
index c71dbb2..88ba300 100644
--- a/samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js
+++ b/samples/OAuth2ProtectedWebApi/Scripts/jquery.validate.js
@@ -1,12 +1,12 @@
-/**
- * jQuery Validation Plugin 1.9.0
+/*!
+ * jQuery Validation Plugin 1.11.1
*
* http://bassistance.de/jquery-plugins/jquery-plugin-validation/
* http://docs.jquery.com/Plugins/Validation
*
- * Copyright (c) 2006 - 2011 Jörn Zaefferer
- *
- * Licensed under MIT: http://www.opensource.org/licenses/mit-license.php
+ * Copyright 2013 Jörn Zaefferer
+ * Released under the MIT license:
+ * http://www.opensource.org/licenses/mit-license.php
*/
(function($) {
@@ -16,53 +16,57 @@ $.extend($.fn, {
validate: function( options ) {
// if nothing is selected, return nothing; can't chain anyway
- if (!this.length) {
- options && options.debug && window.console && console.warn( "nothing selected, can't validate, returning nothing" );
+ if ( !this.length ) {
+ if ( options && options.debug && window.console ) {
+ console.warn( "Nothing selected, can't validate, returning nothing." );
+ }
return;
}
// check if a validator for this form was already created
- var validator = $.data(this[0], 'validator');
+ var validator = $.data( this[0], "validator" );
if ( validator ) {
return validator;
}
// Add novalidate tag if HTML5.
- this.attr('novalidate', 'novalidate');
+ this.attr( "novalidate", "novalidate" );
validator = new $.validator( options, this[0] );
- $.data(this[0], 'validator', validator);
+ $.data( this[0], "validator", validator );
if ( validator.settings.onsubmit ) {
- var inputsAndButtons = this.find("input, button");
+ 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") ) {
+ validator.cancelSubmit = true;
+ }
- // allow suppresing validation by adding a cancel class to the submit button
- inputsAndButtons.filter(".cancel").click(function () {
- validator.cancelSubmit = true;
+ // allow suppressing validation by adding the html5 formnovalidate attribute to the submit button
+ if ( $(event.target).attr("formnovalidate") !== undefined ) {
+ validator.cancelSubmit = true;
+ }
});
- // when a submitHandler is used, capture the submitting button
- if (validator.settings.submitHandler) {
- inputsAndButtons.filter(":submit").click(function () {
- validator.submitButton = this;
- });
- }
-
// validate the form on submit
this.submit( function( event ) {
- if ( validator.settings.debug )
+ if ( validator.settings.debug ) {
// prevent form submit to be able to see console output
event.preventDefault();
-
+ }
function handle() {
+ var hidden;
if ( validator.settings.submitHandler ) {
- if (validator.submitButton) {
+ if ( validator.submitButton ) {
// insert a hidden input as a replacement for the missing submit button
- var hidden = $("<input type='hidden'/>").attr("name", validator.submitButton.name).val(validator.submitButton.value).appendTo(validator.currentForm);
+ hidden = $("<input type='hidden'/>").attr("name", validator.submitButton.name).val( $(validator.submitButton).val() ).appendTo(validator.currentForm);
}
- validator.settings.submitHandler.call( validator, validator.currentForm );
- if (validator.submitButton) {
+ validator.settings.submitHandler.call( validator, validator.currentForm, event );
+ if ( validator.submitButton ) {
// and clean up afterwards; thanks to no-block-scope, hidden can be referenced
hidden.remove();
}
@@ -93,49 +97,52 @@ $.extend($.fn, {
},
// http://docs.jquery.com/Plugins/Validation/valid
valid: function() {
- if ( $(this[0]).is('form')) {
- return this.validate().form();
- } else {
- var valid = true;
- var validator = $(this[0].form).validate();
- this.each(function() {
- valid &= validator.element(this);
- });
- return valid;
- }
- },
+ if ( $(this[0]).is("form")) {
+ return this.validate().form();
+ } else {
+ var valid = true;
+ var validator = $(this[0].form).validate();
+ this.each(function() {
+ valid = valid && validator.element(this);
+ });
+ return valid;
+ }
+ },
// attributes: space seperated list of attributes to retrieve and remove
- removeAttrs: function(attributes) {
+ removeAttrs: function( attributes ) {
var result = {},
$element = this;
- $.each(attributes.split(/\s/), function(index, value) {
+ $.each(attributes.split(/\s/), function( index, value ) {
result[value] = $element.attr(value);
$element.removeAttr(value);
});
return result;
},
// http://docs.jquery.com/Plugins/Validation/rules
- rules: function(command, argument) {
+ rules: function( command, argument ) {
var element = this[0];
- if (command) {
- var settings = $.data(element.form, 'validator').settings;
+ if ( command ) {
+ var settings = $.data(element.form, "validator").settings;
var staticRules = settings.rules;
var existingRules = $.validator.staticRules(element);
switch(command) {
case "add":
$.extend(existingRules, $.validator.normalizeRule(argument));
+ // remove messages from rules, but allow them to be set separetely
+ delete existingRules.messages;
staticRules[element.name] = existingRules;
- if (argument.messages)
+ if ( argument.messages ) {
settings.messages[element.name] = $.extend( settings.messages[element.name], argument.messages );
+ }
break;
case "remove":
- if (!argument) {
+ if ( !argument ) {
delete staticRules[element.name];
return existingRules;
}
var filtered = {};
- $.each(argument.split(/\s/), function(index, method) {
+ $.each(argument.split(/\s/), function( index, method ) {
filtered[method] = existingRules[method];
delete existingRules[method];
});
@@ -146,14 +153,14 @@ $.extend($.fn, {
var data = $.validator.normalizeRules(
$.extend(
{},
- $.validator.metadataRules(element),
$.validator.classRules(element),
$.validator.attributeRules(element),
+ $.validator.dataRules(element),
$.validator.staticRules(element)
), element);
// make sure required is at front
- if (data.required) {
+ if ( data.required ) {
var param = data.required;
delete data.required;
data = $.extend({required: param}, data);
@@ -166,11 +173,11 @@ $.extend($.fn, {
// Custom selectors
$.extend($.expr[":"], {
// http://docs.jquery.com/Plugins/Validation/blank
- blank: function(a) {return !$.trim("" + a.value);},
+ blank: function( a ) { return !$.trim("" + $(a).val()); },
// http://docs.jquery.com/Plugins/Validation/filled
- filled: function(a) {return !!$.trim("" + a.value);},
+ filled: function( a ) { return !!$.trim("" + $(a).val()); },
// http://docs.jquery.com/Plugins/Validation/unchecked
- unchecked: function(a) {return !a.checked;}
+ unchecked: function( a ) { return !$(a).prop("checked"); }
});
// constructor for validator
@@ -180,21 +187,24 @@ $.validator = function( options, form ) {
this.init();
};
-$.validator.format = function(source, params) {
- if ( arguments.length == 1 )
+$.validator.format = function( source, params ) {
+ if ( arguments.length === 1 ) {
return function() {
var args = $.makeArray(arguments);
args.unshift(source);
return $.validator.format.apply( this, args );
};
- if ( arguments.length > 2 && params.constructor != Array ) {
+ }
+ if ( arguments.length > 2 && params.constructor !== Array ) {
params = $.makeArray(arguments).slice(1);
}
- if ( params.constructor != Array ) {
+ if ( params.constructor !== Array ) {
params = [ params ];
}
- $.each(params, function(i, n) {
- source = source.replace(new RegExp("\\{" + i + "\\}", "g"), n);
+ $.each(params, function( i, n ) {
+ source = source.replace( new RegExp("\\{" + i + "\\}", "g"), function() {
+ return n;
+ });
});
return source;
};
@@ -209,47 +219,53 @@ $.extend($.validator, {
validClass: "valid",
errorElement: "label",
focusInvalid: true,
- errorContainer: $( [] ),
- errorLabelContainer: $( [] ),
+ errorContainer: $([]),
+ errorLabelContainer: $([]),
onsubmit: true,
ignore: ":hidden",
ignoreTitle: false,
- onfocusin: function(element, event) {
+ onfocusin: function( element, event ) {
this.lastActive = element;
// hide error label and remove error class on focus if enabled
if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
- this.settings.unhighlight && this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
+ if ( this.settings.unhighlight ) {
+ this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
+ }
this.addWrapper(this.errorsFor(element)).hide();
}
},
- onfocusout: function(element, event) {
+ onfocusout: function( element, event ) {
if ( !this.checkable(element) && (element.name in this.submitted || !this.optional(element)) ) {
this.element(element);
}
},
- onkeyup: function(element, event) {
- if ( element.name in this.submitted || element == this.lastElement ) {
+ onkeyup: function( element, event ) {
+ if ( event.which === 9 && this.elementValue(element) === "" ) {
+ return;
+ } else if ( element.name in this.submitted || element === this.lastElement ) {
this.element(element);
}
},
- onclick: function(element, event) {
+ onclick: function( element, event ) {
// click on selects, radiobuttons and checkboxes
- if ( element.name in this.submitted )
+ if ( element.name in this.submitted ) {
this.element(element);
+ }
// or option elements, check parent select in that case
- else if (element.parentNode.name in this.submitted)
+ else if ( element.parentNode.name in this.submitted ) {
this.element(element.parentNode);
+ }
},
- highlight: function(element, errorClass, validClass) {
- if (element.type === 'radio') {
+ highlight: function( element, errorClass, validClass ) {
+ if ( element.type === "radio" ) {
this.findByName(element.name).addClass(errorClass).removeClass(validClass);
} else {
$(element).addClass(errorClass).removeClass(validClass);
}
},
- unhighlight: function(element, errorClass, validClass) {
- if (element.type === 'radio') {
+ unhighlight: function( element, errorClass, validClass ) {
+ if ( element.type === "radio" ) {
this.findByName(element.name).removeClass(errorClass).addClass(validClass);
} else {
$(element).removeClass(errorClass).addClass(validClass);
@@ -258,7 +274,7 @@ $.extend($.validator, {
},
// http://docs.jquery.com/Plugins/Validation/Validator/setDefaults
- setDefaults: function(settings) {
+ setDefaults: function( settings ) {
$.extend( $.validator.defaults, settings );
},
@@ -273,7 +289,6 @@ $.extend($.validator, {
digits: "Please enter only digits.",
creditcard: "Please enter a valid credit card number.",
equalTo: "Please enter the same value again.",
- accept: "Please enter a value with a valid extension.",
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."),
@@ -298,32 +313,38 @@ $.extend($.validator, {
this.reset();
var groups = (this.groups = {});
- $.each(this.settings.groups, function(key, value) {
- $.each(value.split(/\s/), function(index, name) {
+ $.each(this.settings.groups, function( key, value ) {
+ if ( typeof value === "string" ) {
+ value = value.split(/\s/);
+ }
+ $.each(value, function( index, name ) {
groups[name] = key;
});
});
var rules = this.settings.rules;
- $.each(rules, function(key, value) {
+ $.each(rules, function( key, value ) {
rules[key] = $.validator.normalizeRule(value);
});
function delegate(event) {
var validator = $.data(this[0].form, "validator"),
eventType = "on" + event.type.replace(/^validate/, "");
- validator.settings[eventType] && validator.settings[eventType].call(validator, this[0], event);
+ if ( validator.settings[eventType] ) {
+ validator.settings[eventType].call(validator, this[0], event);
+ }
}
$(this.currentForm)
- .validateDelegate("[type='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'] ",
- "focusin focusout keyup", delegate)
+ .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'] ",
+ "focusin focusout keyup", delegate)
.validateDelegate("[type='radio'], [type='checkbox'], select, option", "click", delegate);
- if (this.settings.invalidHandler)
+ if ( this.settings.invalidHandler ) {
$(this.currentForm).bind("invalid-form.validate", this.settings.invalidHandler);
+ }
},
// http://docs.jquery.com/Plugins/Validation/Validator/form
@@ -331,8 +352,9 @@ $.extend($.validator, {
this.checkForm();
$.extend(this.submitted, this.errorMap);
this.invalid = $.extend({}, this.errorMap);
- if (!this.valid())
+ if ( !this.valid() ) {
$(this.currentForm).triggerHandler("invalid-form", [this]);
+ }
this.showErrors();
return this.valid();
},
@@ -351,7 +373,7 @@ $.extend($.validator, {
this.lastElement = element;
this.prepareElement( element );
this.currentElements = $(element);
- var result = this.check( element );
+ var result = this.check( element ) !== false;
if ( result ) {
delete this.invalid[element.name];
} else {
@@ -366,8 +388,8 @@ $.extend($.validator, {
},
// http://docs.jquery.com/Plugins/Validation/Validator/showErrors
- showErrors: function(errors) {
- if(errors) {
+ showErrors: function( errors ) {
+ if ( errors ) {
// add items to error list and map
$.extend( this.errorMap, errors );
this.errorList = [];
@@ -378,24 +400,27 @@ $.extend($.validator, {
});
}
// remove items from success list
- this.successList = $.grep( this.successList, function(element) {
+ this.successList = $.grep( this.successList, function( element ) {
return !(element.name in errors);
});
}
- this.settings.showErrors
- ? this.settings.showErrors.call( this, this.errorMap, this.errorList )
- : this.defaultShowErrors();
+ if ( this.settings.showErrors ) {
+ this.settings.showErrors.call( this, this.errorMap, this.errorList );
+ } else {
+ this.defaultShowErrors();
+ }
},
// http://docs.jquery.com/Plugins/Validation/Validator/resetForm
resetForm: function() {
- if ( $.fn.resetForm )
- $( this.currentForm ).resetForm();
+ if ( $.fn.resetForm ) {
+ $(this.currentForm).resetForm();
+ }
this.submitted = {};
this.lastElement = null;
this.prepareForm();
this.hideErrors();
- this.elements().removeClass( this.settings.errorClass );
+ this.elements().removeClass( this.settings.errorClass ).removeData( "previousValue" );
},
numberOfInvalids: function() {
@@ -404,8 +429,9 @@ $.extend($.validator, {
objectLength: function( obj ) {
var count = 0;
- for ( var i in obj )
+ for ( var i in obj ) {
count++;
+ }
return count;
},
@@ -414,7 +440,7 @@ $.extend($.validator, {
},
valid: function() {
- return this.size() == 0;
+ return this.size() === 0;
},
size: function() {
@@ -422,7 +448,7 @@ $.extend($.validator, {
},
focusInvalid: function() {
- if( this.settings.focusInvalid ) {
+ if ( this.settings.focusInvalid ) {
try {
$(this.findLastActive() || this.errorList.length && this.errorList[0].element || [])
.filter(":visible")
@@ -437,9 +463,9 @@ $.extend($.validator, {
findLastActive: function() {
var lastActive = this.lastActive;
- return lastActive && $.grep(this.errorList, function(n) {
- return n.element.name == lastActive.name;
- }).length == 1 && lastActive;
+ return lastActive && $.grep(this.errorList, function( n ) {
+ return n.element.name === lastActive.name;
+ }).length === 1 && lastActive;
},
elements: function() {
@@ -452,11 +478,14 @@ $.extend($.validator, {
.not(":submit, :reset, :image, [disabled]")
.not( this.settings.ignore )
.filter(function() {
- !this.name && validator.settings.debug && window.console && console.error( "%o has no name assigned", this);
+ if ( !this.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()) )
+ if ( this.name in rulesCache || !validator.objectLength($(this).rules()) ) {
return false;
+ }
rulesCache[this.name] = true;
return true;
@@ -464,11 +493,12 @@ $.extend($.validator, {
},
clean: function( selector ) {
- return $( selector )[0];
+ return $(selector)[0];
},
errors: function() {
- return $( this.settings.errorElement + "." + this.settings.errorClass, this.errorContext );
+ var errorClass = this.settings.errorClass.replace(" ", ".");
+ return $(this.settings.errorElement + "." + errorClass, this.errorContext);
},
reset: function() {
@@ -490,80 +520,93 @@ $.extend($.validator, {
this.toHide = this.errorsFor(element);
},
+ elementValue: function( element ) {
+ var type = $(element).attr("type"),
+ val = $(element).val();
+
+ if ( type === "radio" || type === "checkbox" ) {
+ return $("input[name='" + $(element).attr("name") + "']:checked").val();
+ }
+
+ if ( typeof val === "string" ) {
+ return val.replace(/\r/g, "");
+ }
+ return val;
+ },
+
check: function( element ) {
element = this.validationTargetFor( this.clean( element ) );
var rules = $(element).rules();
var dependencyMismatch = false;
+ var val = this.elementValue(element);
+ var result;
+
for (var method in rules ) {
var rule = { method: method, parameters: rules[method] };
try {
- var result = $.validator.methods[method].call( this, element.value.replace(/\r/g, ""), element, rule.parameters );
+
+ result = $.validator.methods[method].call( this, val, element, rule.parameters );
// 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" ) {
+ if ( result === "dependency-mismatch" ) {
dependencyMismatch = true;
continue;
}
dependencyMismatch = false;
- if ( result == "pending" ) {
+ if ( result === "pending" ) {
this.toHide = this.toHide.not( this.errorsFor(element) );
return;
}
- if( !result ) {
+ if ( !result ) {
this.formatAndAdd( element, rule );
return false;
}
} catch(e) {
- this.settings.debug && window.console && console.log("exception occured when checking element " + element.id
- + ", check the '" + rule.method + "' method", e);
+ if ( this.settings.debug && window.console ) {
+ console.log( "Exception occurred when checking element " + element.id + ", check the '" + rule.method + "' method.", e );
+ }
throw e;
}
}
- if (dependencyMismatch)
+ if ( dependencyMismatch ) {
return;
- if ( this.objectLength(rules) )
+ }
+ if ( this.objectLength(rules) ) {
this.successList.push(element);
+ }
return true;
},
// return the custom message for the given element and validation method
- // specified in the element's "messages" metadata
- customMetaMessage: function(element, method) {
- if (!$.metadata)
- return;
-
- var meta = this.settings.meta
- ? $(element).metadata()[this.settings.meta]
- : $(element).metadata();
-
- return meta && meta.messages && meta.messages[method];
+ // specified in the element's HTML5 data attribute
+ customDataMessage: function( element, method ) {
+ return $(element).data("msg-" + method.toLowerCase()) || (element.attributes && $(element).attr("data-msg-" + method.toLowerCase()));
},
// 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
findDefined: function() {
for(var i = 0; i < arguments.length; i++) {
- if (arguments[i] !== undefined)
+ if ( arguments[i] !== undefined ) {
return arguments[i];
+ }
}
return undefined;
},
- defaultMessage: function( element, method) {
+ defaultMessage: function( element, method ) {
return this.findDefined(
this.customMessage( element.name, method ),
- this.customMetaMessage( element, method ),
+ this.customDataMessage( element, method ),
// title is never undefined, so handle empty string as undefined
!this.settings.ignoreTitle && element.title || undefined,
$.validator.messages[method],
@@ -574,10 +617,10 @@ $.extend($.validator, {
formatAndAdd: function( element, rule ) {
var message = this.defaultMessage( element, rule.method ),
theregex = /\$?\{(\d+)\}/g;
- if ( typeof message == "function" ) {
+ if ( typeof message === "function" ) {
message = message.call(this, rule.parameters, element);
} else if (theregex.test(message)) {
- message = jQuery.format(message.replace(theregex, '{$1}'), rule.parameters);
+ message = $.validator.format(message.replace(theregex, "{$1}"), rule.parameters);
}
this.errorList.push({
message: message,
@@ -588,28 +631,32 @@ $.extend($.validator, {
this.submitted[element.name] = message;
},
- addWrapper: function(toToggle) {
- if ( this.settings.wrapper )
+ addWrapper: function( toToggle ) {
+ if ( this.settings.wrapper ) {
toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
+ }
return toToggle;
},
defaultShowErrors: function() {
- for ( var i = 0; this.errorList[i]; i++ ) {
+ var i, elements;
+ for ( i = 0; this.errorList[i]; i++ ) {
var error = this.errorList[i];
- this.settings.highlight && this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
+ if ( this.settings.highlight ) {
+ this.settings.highlight.call( this, error.element, this.settings.errorClass, this.settings.validClass );
+ }
this.showLabel( error.element, error.message );
}
- if( this.errorList.length ) {
+ if ( this.errorList.length ) {
this.toShow = this.toShow.add( this.containers );
}
- if (this.settings.success) {
- for ( var i = 0; this.successList[i]; i++ ) {
+ if ( this.settings.success ) {
+ for ( i = 0; this.successList[i]; i++ ) {
this.showLabel( this.successList[i] );
}
}
- if (this.settings.unhighlight) {
- for ( var i = 0, elements = this.validElements(); elements[i]; i++ ) {
+ if ( this.settings.unhighlight ) {
+ for ( i = 0, elements = this.validElements(); elements[i]; i++ ) {
this.settings.unhighlight.call( this, elements[i], this.settings.errorClass, this.settings.validClass );
}
}
@@ -628,18 +675,17 @@ $.extend($.validator, {
});
},
- showLabel: function(element, message) {
+ showLabel: function( element, message ) {
var label = this.errorsFor( element );
if ( label.length ) {
// refresh error/success class
label.removeClass( this.settings.validClass ).addClass( this.settings.errorClass );
-
- // check if we have a generated label, replace the message then
- label.attr("generated") && label.html(message);
+ // replace message on existing label
+ label.html(message);
} else {
// create label
- label = $("<" + this.settings.errorElement + "/>")
- .attr({"for": this.idOrName(element), generated: true})
+ label = $("<" + this.settings.errorElement + ">")
+ .attr("for", this.idOrName(element))
.addClass(this.settings.errorClass)
.html(message || "");
if ( this.settings.wrapper ) {
@@ -647,107 +693,109 @@ $.extend($.validator, {
// actually showing the wrapped element is handled elsewhere
label = label.hide().show().wrap("<" + this.settings.wrapper + "/>").parent();
}
- if ( !this.labelContainer.append(label).length )
- this.settings.errorPlacement
- ? this.settings.errorPlacement(label, $(element) )
- : label.insertAfter(element);
+ if ( !this.labelContainer.append(label).length ) {
+ if ( this.settings.errorPlacement ) {
+ this.settings.errorPlacement(label, $(element) );
+ } else {
+ label.insertAfter(element);
+ }
+ }
}
if ( !message && this.settings.success ) {
label.text("");
- typeof this.settings.success == "string"
- ? label.addClass( this.settings.success )
- : this.settings.success( label );
+ if ( typeof this.settings.success === "string" ) {
+ label.addClass( this.settings.success );
+ } else {
+ this.settings.success( label, element );
+ }
}
this.toShow = this.toShow.add(label);
},
- errorsFor: function(element) {
+ errorsFor: function( element ) {
var name = this.idOrName(element);
- return this.errors().filter(function() {
- return $(this).attr('for') == name;
+ return this.errors().filter(function() {
+ return $(this).attr("for") === name;
});
},
- idOrName: function(element) {
+ idOrName: function( element ) {
return this.groups[element.name] || (this.checkable(element) ? element.name : element.id || element.name);
},
- validationTargetFor: function(element) {
+ validationTargetFor: function( element ) {
// if radio/checkbox, validate first element in group instead
- if (this.checkable(element)) {
+ if ( this.checkable(element) ) {
element = this.findByName( element.name ).not(this.settings.ignore)[0];
}
return element;
},
checkable: function( element ) {
- return /radio|checkbox/i.test(element.type);
+ return (/radio|checkbox/i).test(element.type);
},
findByName: function( name ) {
- // select by name and filter by form for performance over form.find("[name=...]")
- var form = this.currentForm;
- return $(document.getElementsByName(name)).map(function(index, element) {
- return element.form == form && element.name == name && element || null;
- });
+ return $(this.currentForm).find("[name='" + name + "']");
},
- getLength: function(value, element) {
+ getLength: function( value, element ) {
switch( element.nodeName.toLowerCase() ) {
- case 'select':
+ case "select":
return $("option:selected", element).length;
- case 'input':
- if( this.checkable( element) )
- return this.findByName(element.name).filter(':checked').length;
+ case "input":
+ if ( this.checkable( element) ) {
+ return this.findByName(element.name).filter(":checked").length;
+ }
}
return value.length;
},
- depend: function(param, element) {
- return this.dependTypes[typeof param]
- ? this.dependTypes[typeof param](param, element)
- : true;
+ depend: function( param, element ) {
+ return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true;
},
dependTypes: {
- "boolean": function(param, element) {
+ "boolean": function( param, element ) {
return param;
},
- "string": function(param, element) {
+ "string": function( param, element ) {
return !!$(param, element.form).length;
},
- "function": function(param, element) {
+ "function": function( param, element ) {
return param(element);
}
},
- optional: function(element) {
- return !$.validator.methods.required.call(this, $.trim(element.value), element) && "dependency-mismatch";
+ optional: function( element ) {
+ var val = this.elementValue(element);
+ return !$.validator.methods.required.call(this, val, element) && "dependency-mismatch";
},
- startRequest: function(element) {
- if (!this.pending[element.name]) {
+ startRequest: function( element ) {
+ if ( !this.pending[element.name] ) {
this.pendingRequest++;
this.pending[element.name] = true;
}
},
- stopRequest: function(element, valid) {
+ stopRequest: function( element, valid ) {
this.pendingRequest--;
// sometimes synchronization fails, make sure pendingRequest is never < 0
- if (this.pendingRequest < 0)
+ if ( this.pendingRequest < 0 ) {
this.pendingRequest = 0;
+ }
delete this.pending[element.name];
- if ( valid && this.pendingRequest == 0 && this.formSubmitted && this.form() ) {
+ if ( valid && this.pendingRequest === 0 && this.formSubmitted && this.form() ) {
$(this.currentForm).submit();
this.formSubmitted = false;
- } else if (!valid && this.pendingRequest == 0 && this.formSubmitted) {
+ } else if (!valid && this.pendingRequest === 0 && this.formSubmitted) {
$(this.currentForm).triggerHandler("invalid-form", [this]);
this.formSubmitted = false;
}
},
- previousValue: function(element) {
+ previousValue: function( element ) {
return $.data(element, "previousValue") || $.data(element, "previousValue", {
old: null,
valid: true,
@@ -763,94 +811,117 @@ $.extend($.validator, {
url: {url: true},
date: {date: true},
dateISO: {dateISO: true},
- dateDE: {dateDE: true},
number: {number: true},
- numberDE: {numberDE: true},
digits: {digits: true},
creditcard: {creditcard: true}
},
- addClassRules: function(className, rules) {
- className.constructor == String ?
- this.classRuleSettings[className] = rules :
+ addClassRules: function( className, rules ) {
+ if ( className.constructor === String ) {
+ this.classRuleSettings[className] = rules;
+ } else {
$.extend(this.classRuleSettings, className);
+ }
},
- classRules: function(element) {
+ classRules: function( element ) {
var rules = {};
- var classes = $(element).attr('class');
- classes && $.each(classes.split(' '), function() {
- if (this in $.validator.classRuleSettings) {
- $.extend(rules, $.validator.classRuleSettings[this]);
- }
- });
+ var classes = $(element).attr("class");
+ if ( classes ) {
+ $.each(classes.split(" "), function() {
+ if ( this in $.validator.classRuleSettings ) {
+ $.extend(rules, $.validator.classRuleSettings[this]);
+ }
+ });
+ }
return rules;
},
- attributeRules: function(element) {
+ attributeRules: function( element ) {
var rules = {};
var $element = $(element);
+ var type = $element[0].getAttribute("type");
for (var method in $.validator.methods) {
var value;
- // If .prop exists (jQuery >= 1.6), use it to get true/false for required
- if (method === 'required' && typeof $.fn.prop === 'function') {
- value = $element.prop(method);
+
+ // support for <input required> in both html5 and older browsers
+ if ( method === "required" ) {
+ value = $element.get(0).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
+ value = !!value;
} else {
value = $element.attr(method);
}
- if (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/.test( method ) && ( type === null || /number|range|text/.test( type ) ) ) {
+ value = Number(value);
+ }
+
+ if ( value ) {
rules[method] = value;
- } else if ($element[0].getAttribute("type") === method) {
+ } else if ( type === method && type !== 'range' ) {
+ // exception: the jquery validate 'range' method
+ // does not test for the html5 'range' type
rules[method] = true;
}
}
// maxlength may be returned as -1, 2147483647 (IE) and 524288 (safari) for text inputs
- if (rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength)) {
+ if ( rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength) ) {
delete rules.maxlength;
}
return rules;
},
- metadataRules: function(element) {
- if (!$.metadata) return {};
-
- var meta = $.data(element.form, 'validator').settings.meta;
- return meta ?
- $(element).metadata()[meta] :
- $(element).metadata();
+ dataRules: function( element ) {
+ var method, value,
+ rules = {}, $element = $(element);
+ for (method in $.validator.methods) {
+ value = $element.data("rule-" + method.toLowerCase());
+ if ( value !== undefined ) {
+ rules[method] = value;
+ }
+ }
+ return rules;
},
- staticRules: function(element) {
+ staticRules: function( element ) {
var rules = {};
- var validator = $.data(element.form, 'validator');
- if (validator.settings.rules) {
+ var validator = $.data(element.form, "validator");
+ if ( validator.settings.rules ) {
rules = $.validator.normalizeRule(validator.settings.rules[element.name]) || {};
}
return rules;
},
- normalizeRules: function(rules, element) {
+ normalizeRules: function( rules, element ) {
// handle dependency check
- $.each(rules, function(prop, val) {
+ $.each(rules, function( prop, val ) {
// ignore rule when param is explicitly false, eg. required:false
- if (val === false) {
+ if ( val === false ) {
delete rules[prop];
return;
}
- if (val.param || val.depends) {
+ if ( val.param || val.depends ) {
var keepRule = true;
switch (typeof val.depends) {
- case "string":
- keepRule = !!$(val.depends, element.form).length;
- break;
- case "function":
- keepRule = val.depends.call(element, element);
- break;
+ case "string":
+ keepRule = !!$(val.depends, element.form).length;
+ break;
+ case "function":
+ keepRule = val.depends.call(element, element);
+ break;
}
- if (keepRule) {
+ if ( keepRule ) {
rules[prop] = val.param !== undefined ? val.param : true;
} else {
delete rules[prop];
@@ -859,47 +930,48 @@ $.extend($.validator, {
});
// evaluate parameters
- $.each(rules, function(rule, parameter) {
+ $.each(rules, function( rule, parameter ) {
rules[rule] = $.isFunction(parameter) ? parameter(element) : parameter;
});
// clean number parameters
- $.each(['minlength', 'maxlength', 'min', 'max'], function() {
- if (rules[this]) {
+ $.each(['minlength', 'maxlength'], function() {
+ if ( rules[this] ) {
rules[this] = Number(rules[this]);
}
});
$.each(['rangelength', 'range'], function() {
- if (rules[this]) {
- rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
+ var parts;
+ if ( rules[this] ) {
+ if ( $.isArray(rules[this]) ) {
+ rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
+ } else if ( typeof rules[this] === "string" ) {
+ parts = rules[this].split(/[\s,]+/);
+ rules[this] = [Number(parts[0]), Number(parts[1])];
+ }
}
});
- if ($.validator.autoCreateRanges) {
+ if ( $.validator.autoCreateRanges ) {
// auto-create ranges
- if (rules.min && rules.max) {
+ if ( rules.min && rules.max ) {
rules.range = [rules.min, rules.max];
delete rules.min;
delete rules.max;
}
- if (rules.minlength && rules.maxlength) {
+ if ( rules.minlength && rules.maxlength ) {
rules.rangelength = [rules.minlength, rules.maxlength];
delete rules.minlength;
delete rules.maxlength;
}
}
- // To support custom messages in metadata ignore rule methods titled "messages"
- if (rules.messages) {
- delete rules.messages;
- }
-
return rules;
},
// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
- normalizeRule: function(data) {
- if( typeof data == "string" ) {
+ normalizeRule: function( data ) {
+ if ( typeof data === "string" ) {
var transformed = {};
$.each(data.split(/\s/), function() {
transformed[this] = true;
@@ -910,10 +982,10 @@ $.extend($.validator, {
},
// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
- addMethod: function(name, method, message) {
+ addMethod: function( name, method, message ) {
$.validator.methods[name] = method;
- $.validator.messages[name] = message != undefined ? message : $.validator.messages[name];
- if (method.length < 3) {
+ $.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
+ if ( method.length < 3 ) {
$.validator.addClassRules(name, $.validator.normalizeRule(name));
}
},
@@ -921,147 +993,64 @@ $.extend($.validator, {
methods: {
// http://docs.jquery.com/Plugins/Validation/Methods/required
- required: function(value, element, param) {
+ required: function( value, element, param ) {
// check if dependency is met
- if ( !this.depend(param, element) )
+ if ( !this.depend(param, element) ) {
return "dependency-mismatch";
- switch( element.nodeName.toLowerCase() ) {
- case 'select':
+ }
+ if ( element.nodeName.toLowerCase() === "select" ) {
// could be an array for select-multiple or a string, both are fine this way
var val = $(element).val();
return val && val.length > 0;
- case 'input':
- if ( this.checkable(element) )
- return this.getLength(value, element) > 0;
- default:
- return $.trim(value).length > 0;
}
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/remote
- remote: function(value, element, param) {
- if ( this.optional(element) )
- return "dependency-mismatch";
-
- var previous = this.previousValue(element);
- 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;
-
- param = typeof param == "string" && {url:param} || param;
-
- if ( this.pending[element.name] ) {
- return "pending";
+ if ( this.checkable(element) ) {
+ return this.getLength(value, element) > 0;
}
- if ( previous.old === value ) {
- return previous.valid;
- }
-
- previous.old = value;
- var validator = this;
- this.startRequest(element);
- var data = {};
- data[element.name] = value;
- $.ajax($.extend(true, {
- url: param,
- mode: "abort",
- port: "validate" + element.name,
- dataType: "json",
- data: data,
- success: function(response) {
- validator.settings.messages[element.name].remote = previous.originalMessage;
- var valid = response === true;
- if ( valid ) {
- var submitted = validator.formSubmitted;
- validator.prepareElement(element);
- validator.formSubmitted = submitted;
- validator.successList.push(element);
- validator.showErrors();
- } else {
- var errors = {};
- var message = response || validator.defaultMessage( element, "remote" );
- errors[element.name] = previous.message = $.isFunction(message) ? message(value) : message;
- validator.showErrors(errors);
- }
- previous.valid = valid;
- validator.stopRequest(element, valid);
- }
- }, param));
- return "pending";
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/minlength
- minlength: function(value, element, param) {
- return this.optional(element) || this.getLength($.trim(value), element) >= param;
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/maxlength
- maxlength: function(value, element, param) {
- return this.optional(element) || this.getLength($.trim(value), element) <= param;
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/rangelength
- rangelength: function(value, element, param) {
- var length = this.getLength($.trim(value), element);
- return this.optional(element) || ( length >= param[0] && length <= param[1] );
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/min
- min: function( value, element, param ) {
- return this.optional(element) || value >= param;
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/max
- max: function( value, element, param ) {
- return this.optional(element) || value <= param;
- },
-
- // http://docs.jquery.com/Plugins/Validation/Methods/range
- range: function( value, element, param ) {
- return this.optional(element) || ( value >= param[0] && value <= param[1] );
+ return $.trim(value).length > 0;
},
// http://docs.jquery.com/Plugins/Validation/Methods/email
- email: function(value, element) {
+ email: function( value, element ) {
// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
return this.optional(element) || /^((([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.test(value);
},
// http://docs.jquery.com/Plugins/Validation/Methods/url
- url: function(value, element) {
+ url: function( value, element ) {
// contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
- return this.optional(element) || /^(https?|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);
+ 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);
},
// http://docs.jquery.com/Plugins/Validation/Methods/date
- date: function(value, element) {
- return this.optional(element) || !/Invalid|NaN/.test(new Date(value));
+ date: function( value, element ) {
+ return this.optional(element) || !/Invalid|NaN/.test(new Date(value).toString());
},
// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
- dateISO: function(value, element) {
- return this.optional(element) || /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(value);
+ dateISO: function( value, element ) {
+ return this.optional(element) || /^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(value);
},
// http://docs.jquery.com/Plugins/Validation/Methods/number
- number: function(value, element) {
- return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/.test(value);
+ number: function( value, element ) {
+ return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value);
},
// http://docs.jquery.com/Plugins/Validation/Methods/digits
- digits: function(value, element) {
+ digits: function( value, element ) {
return this.optional(element) || /^\d+$/.test(value);
},
// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
// based on http://en.wikipedia.org/wiki/Luhn
- creditcard: function(value, element) {
- if ( this.optional(element) )
+ creditcard: function( value, element ) {
+ if ( this.optional(element) ) {
return "dependency-mismatch";
+ }
// accept only spaces, digits and dashes
- if (/[^0-9 -]+/.test(value))
+ if ( /[^0-9 \-]+/.test(value) ) {
return false;
+ }
var nCheck = 0,
nDigit = 0,
bEven = false;
@@ -1070,32 +1059,117 @@ $.extend($.validator, {
for (var n = value.length - 1; n >= 0; n--) {
var cDigit = value.charAt(n);
- var nDigit = parseInt(cDigit, 10);
- if (bEven) {
- if ((nDigit *= 2) > 9)
+ nDigit = parseInt(cDigit, 10);
+ if ( bEven ) {
+ if ( (nDigit *= 2) > 9 ) {
nDigit -= 9;
+ }
}
nCheck += nDigit;
bEven = !bEven;
}
- return (nCheck % 10) == 0;
+ return (nCheck % 10) === 0;
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/minlength
+ minlength: function( value, element, param ) {
+ var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+ return this.optional(element) || length >= param;
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/maxlength
+ maxlength: function( value, element, param ) {
+ var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+ return this.optional(element) || length <= param;
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/rangelength
+ rangelength: function( value, element, param ) {
+ var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
+ return this.optional(element) || ( length >= param[0] && length <= param[1] );
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/min
+ min: function( value, element, param ) {
+ return this.optional(element) || value >= param;
},
- // http://docs.jquery.com/Plugins/Validation/Methods/accept
- accept: function(value, element, param) {
- param = typeof param == "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif";
- return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
+ // http://docs.jquery.com/Plugins/Validation/Methods/max
+ max: function( value, element, param ) {
+ return this.optional(element) || value <= param;
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/range
+ range: function( value, element, param ) {
+ return this.optional(element) || ( value >= param[0] && value <= param[1] );
},
// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
- equalTo: function(value, element, param) {
+ 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
- var target = $(param).unbind(".validate-equalTo").bind("blur.validate-equalTo", function() {
- $(element).valid();
- });
- return value == target.val();
+ var target = $(param);
+ if ( this.settings.onfocusout ) {
+ target.unbind(".validate-equalTo").bind("blur.validate-equalTo", function() {
+ $(element).valid();
+ });
+ }
+ return value === target.val();
+ },
+
+ // http://docs.jquery.com/Plugins/Validation/Methods/remote
+ remote: function( value, element, param ) {
+ if ( this.optional(element) ) {
+ return "dependency-mismatch";
+ }
+
+ var previous = this.previousValue(element);
+ 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;
+
+ param = typeof param === "string" && {url:param} || param;
+
+ if ( previous.old === value ) {
+ return previous.valid;
+ }
+
+ previous.old = value;
+ var validator = this;
+ this.startRequest(element);
+ var data = {};
+ data[element.name] = value;
+ $.ajax($.extend(true, {
+ url: param,
+ mode: "abort",
+ port: "validate" + element.name,
+ dataType: "json",
+ data: data,
+ success: function( response ) {
+ validator.settings.messages[element.name].remote = previous.originalMessage;
+ var valid = response === true || response === "true";
+ if ( valid ) {
+ var submitted = validator.formSubmitted;
+ validator.prepareElement(element);
+ validator.formSubmitted = submitted;
+ validator.successList.push(element);
+ delete validator.invalid[element.name];
+ validator.showErrors();
+ } else {
+ var errors = {};
+ var message = response || validator.defaultMessage( element, "remote" );
+ errors[element.name] = previous.message = $.isFunction(message) ? message(value) : message;
+ validator.invalid[element.name] = true;
+ validator.showErrors(errors);
+ }
+ previous.valid = valid;
+ validator.stopRequest(element, valid);
+ }
+ }, param));
+ return "pending";
}
}
@@ -1105,18 +1179,18 @@ $.extend($.validator, {
// deprecated, use $.validator.format instead
$.format = $.validator.format;
-})(jQuery);
+}(jQuery));
// 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()
-;(function($) {
+(function($) {
var pendingRequests = {};
// 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 ( settings.mode === "abort" ) {
if ( pendingRequests[port] ) {
pendingRequests[port].abort();
}
@@ -1126,61 +1200,32 @@ $.format = $.validator.format;
} else {
// Proxy ajax
var ajax = $.ajax;
- $.ajax = function(settings) {
+ $.ajax = function( settings ) {
var mode = ( "mode" in settings ? settings : $.ajaxSettings ).mode,
port = ( "port" in settings ? settings : $.ajaxSettings ).port;
- if (mode == "abort") {
+ if ( mode === "abort" ) {
if ( pendingRequests[port] ) {
pendingRequests[port].abort();
}
- return (pendingRequests[port] = ajax.apply(this, arguments));
+ pendingRequests[port] = ajax.apply(this, arguments);
+ return pendingRequests[port];
}
return ajax.apply(this, arguments);
};
}
-})(jQuery);
-
-// provides cross-browser focusin and focusout events
-// IE has native support, in other browsers, use event caputuring (neither bubbles)
+}(jQuery));
// 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
-;(function($) {
- // only implement if not provided by jQuery core (since 1.4)
- // TODO verify if jQuery 1.4's implementation is compatible with older jQuery special-event APIs
- if (!jQuery.event.special.focusin && !jQuery.event.special.focusout && document.addEventListener) {
- $.each({
- focus: 'focusin',
- blur: 'focusout'
- }, function( original, fix ){
- $.event.special[fix] = {
- setup:function() {
- this.addEventListener( original, handler, true );
- },
- teardown:function() {
- this.removeEventListener( original, handler, true );
- },
- handler: function(e) {
- arguments[0] = $.event.fix(e);
- arguments[0].type = fix;
- return $.event.handle.apply(this, arguments);
- }
- };
- function handler(e) {
- e = $.event.fix(e);
- e.type = fix;
- return $.event.handle.call(this, e);
- }
- });
- };
+(function($) {
$.extend($.fn, {
- validateDelegate: function(delegate, type, handler) {
- return this.bind(type, function(event) {
+ validateDelegate: function( delegate, type, handler ) {
+ return this.bind(type, function( event ) {
var target = $(event.target);
- if (target.is(delegate)) {
+ if ( target.is(delegate) ) {
return handler.apply(target, arguments);
}
});
}
});
-})(jQuery);
+}(jQuery));