Update client side libraries
This commit is contained in:
Vendored
+237
-177
@@ -1,15 +1,6 @@
|
||||
/**
|
||||
* jQuery Validation Plugin 1.9.0
|
||||
*
|
||||
* http://bassistance.de/jquery-plugins/jquery-plugin-validation/
|
||||
* http://docs.jquery.com/Plugins/Validation
|
||||
*
|
||||
* Copyright (c) 2006 - 2011 Jörn Zaefferer
|
||||
*
|
||||
* Dual licensed under the MIT and GPL licenses:
|
||||
* http://www.opensource.org/licenses/mit-license.php
|
||||
* http://www.gnu.org/licenses/gpl.html
|
||||
*/
|
||||
/*! jQuery Validation Plugin - v1.10.0 - 9/7/2012
|
||||
* https://github.com/jzaefferer/jquery-validation
|
||||
* Copyright (c) 2012 Jörn Zaefferer; Licensed MIT */
|
||||
|
||||
(function($) {
|
||||
|
||||
@@ -19,7 +10,9 @@ $.extend($.fn, {
|
||||
|
||||
// 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 (options && options.debug && window.console) {
|
||||
console.warn( "nothing selected, can't validate, returning nothing" );
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -37,33 +30,30 @@ $.extend($.fn, {
|
||||
|
||||
if ( validator.settings.onsubmit ) {
|
||||
|
||||
var inputsAndButtons = this.find("input, button");
|
||||
|
||||
// allow suppresing validation by adding a cancel class to the submit button
|
||||
inputsAndButtons.filter(".cancel").click(function () {
|
||||
validator.cancelSubmit = true;
|
||||
this.validateDelegate( ":submit", "click", function(ev) {
|
||||
if ( validator.settings.submitHandler ) {
|
||||
validator.submitButton = ev.target;
|
||||
}
|
||||
// allow suppressing validation by adding a cancel class to the submit button
|
||||
if ( $(ev.target).hasClass('cancel') ) {
|
||||
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) {
|
||||
// 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.value).appendTo(validator.currentForm);
|
||||
}
|
||||
validator.settings.submitHandler.call( validator, 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
|
||||
hidden.remove();
|
||||
@@ -95,17 +85,17 @@ $.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() {
|
||||
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;
|
||||
}
|
||||
},
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
},
|
||||
// attributes: space seperated list of attributes to retrieve and remove
|
||||
removeAttrs: function(attributes) {
|
||||
var result = {},
|
||||
@@ -128,8 +118,9 @@ $.extend($.fn, {
|
||||
case "add":
|
||||
$.extend(existingRules, $.validator.normalizeRule(argument));
|
||||
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) {
|
||||
@@ -183,16 +174,17 @@ $.validator = function( options, form ) {
|
||||
};
|
||||
|
||||
$.validator.format = function(source, params) {
|
||||
if ( arguments.length == 1 )
|
||||
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) {
|
||||
@@ -221,7 +213,9 @@ $.extend($.validator, {
|
||||
|
||||
// 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();
|
||||
}
|
||||
},
|
||||
@@ -231,17 +225,21 @@ $.extend($.validator, {
|
||||
}
|
||||
},
|
||||
onkeyup: function(element, event) {
|
||||
if ( element.name in this.submitted || element == this.lastElement ) {
|
||||
if ( event.which === 9 && this.elementValue(element) === '' ) {
|
||||
return;
|
||||
} else if ( element.name in this.submitted || element === this.lastActive ) {
|
||||
this.element(element);
|
||||
}
|
||||
},
|
||||
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') {
|
||||
@@ -275,7 +273,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."),
|
||||
@@ -313,19 +310,22 @@ $.extend($.validator, {
|
||||
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
|
||||
@@ -333,8 +333,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();
|
||||
},
|
||||
@@ -353,8 +354,8 @@ $.extend($.validator, {
|
||||
this.lastElement = element;
|
||||
this.prepareElement( element );
|
||||
this.currentElements = $(element);
|
||||
var result = this.check( element );
|
||||
if ( result ) {
|
||||
var result = this.check( element ) !== false;
|
||||
if (result) {
|
||||
delete this.invalid[element.name];
|
||||
} else {
|
||||
this.invalid[element.name] = true;
|
||||
@@ -384,20 +385,23 @@ $.extend($.validator, {
|
||||
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 )
|
||||
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() {
|
||||
@@ -406,8 +410,9 @@ $.extend($.validator, {
|
||||
|
||||
objectLength: function( obj ) {
|
||||
var count = 0;
|
||||
for ( var i in obj )
|
||||
for ( var i in obj ) {
|
||||
count++;
|
||||
}
|
||||
return count;
|
||||
},
|
||||
|
||||
@@ -416,7 +421,7 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
valid: function() {
|
||||
return this.size() == 0;
|
||||
return this.size() === 0;
|
||||
},
|
||||
|
||||
size: function() {
|
||||
@@ -440,8 +445,8 @@ $.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 n.element.name === lastActive.name;
|
||||
}).length === 1 && lastActive;
|
||||
},
|
||||
|
||||
elements: function() {
|
||||
@@ -454,11 +459,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;
|
||||
@@ -470,7 +478,8 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
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() {
|
||||
@@ -492,25 +501,43 @@ $.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;
|
||||
}
|
||||
@@ -520,44 +547,49 @@ $.extend($.validator, {
|
||||
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 occured 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)
|
||||
if (!$.metadata) {
|
||||
return;
|
||||
|
||||
var meta = this.settings.meta
|
||||
? $(element).metadata()[this.settings.meta]
|
||||
: $(element).metadata();
|
||||
|
||||
}
|
||||
var meta = this.settings.meta ? $(element).metadata()[this.settings.meta] : $(element).metadata();
|
||||
return meta && meta.messages && meta.messages[method];
|
||||
},
|
||||
|
||||
// return the custom message for the given element and validation 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;
|
||||
},
|
||||
@@ -565,6 +597,7 @@ $.extend($.validator, {
|
||||
defaultMessage: function( element, method) {
|
||||
return this.findDefined(
|
||||
this.customMessage( element.name, method ),
|
||||
this.customDataMessage( element, method ),
|
||||
this.customMetaMessage( element, method ),
|
||||
// title is never undefined, so handle empty string as undefined
|
||||
!this.settings.ignoreTitle && element.title || undefined,
|
||||
@@ -576,10 +609,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,
|
||||
@@ -591,27 +624,31 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
addWrapper: function(toToggle) {
|
||||
if ( this.settings.wrapper )
|
||||
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 ) {
|
||||
this.toShow = this.toShow.add( this.containers );
|
||||
}
|
||||
if (this.settings.success) {
|
||||
for ( var i = 0; this.successList[i]; i++ ) {
|
||||
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++ ) {
|
||||
for ( i = 0, elements = this.validElements(); elements[i]; i++ ) {
|
||||
this.settings.unhighlight.call( this, elements[i], this.settings.errorClass, this.settings.validClass );
|
||||
}
|
||||
}
|
||||
@@ -637,7 +674,9 @@ $.extend($.validator, {
|
||||
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);
|
||||
if ( label.attr("generated") ) {
|
||||
label.html(message);
|
||||
}
|
||||
} else {
|
||||
// create label
|
||||
label = $("<" + this.settings.errorElement + "/>")
|
||||
@@ -649,24 +688,29 @@ $.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) {
|
||||
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;
|
||||
});
|
||||
},
|
||||
|
||||
@@ -683,15 +727,11 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
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) {
|
||||
@@ -699,16 +739,15 @@ $.extend($.validator, {
|
||||
case 'select':
|
||||
return $("option:selected", element).length;
|
||||
case 'input':
|
||||
if( this.checkable( element) )
|
||||
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;
|
||||
return this.dependTypes[typeof param] ? this.dependTypes[typeof param](param, element) : true;
|
||||
},
|
||||
|
||||
dependTypes: {
|
||||
@@ -724,7 +763,8 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
optional: function(element) {
|
||||
return !$.validator.methods.required.call(this, $.trim(element.value), element) && "dependency-mismatch";
|
||||
var val = this.elementValue(element);
|
||||
return !$.validator.methods.required.call(this, val, element) && "dependency-mismatch";
|
||||
},
|
||||
|
||||
startRequest: function(element) {
|
||||
@@ -737,13 +777,14 @@ $.extend($.validator, {
|
||||
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;
|
||||
}
|
||||
@@ -765,27 +806,29 @@ $.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 :
|
||||
if ( className.constructor === String ) {
|
||||
this.classRuleSettings[className] = rules;
|
||||
} else {
|
||||
$.extend(this.classRuleSettings, className);
|
||||
}
|
||||
},
|
||||
|
||||
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]);
|
||||
}
|
||||
});
|
||||
if ( classes ) {
|
||||
$.each(classes.split(' '), function() {
|
||||
if (this in $.validator.classRuleSettings) {
|
||||
$.extend(rules, $.validator.classRuleSettings[this]);
|
||||
}
|
||||
});
|
||||
}
|
||||
return rules;
|
||||
},
|
||||
|
||||
@@ -795,12 +838,21 @@ $.extend($.validator, {
|
||||
|
||||
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) {
|
||||
rules[method] = value;
|
||||
} else if ($element[0].getAttribute("type") === method) {
|
||||
@@ -817,7 +869,9 @@ $.extend($.validator, {
|
||||
},
|
||||
|
||||
metadataRules: function(element) {
|
||||
if (!$.metadata) return {};
|
||||
if (!$.metadata) {
|
||||
return {};
|
||||
}
|
||||
|
||||
var meta = $.data(element.form, 'validator').settings.meta;
|
||||
return meta ?
|
||||
@@ -901,7 +955,7 @@ $.extend($.validator, {
|
||||
|
||||
// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
|
||||
normalizeRule: function(data) {
|
||||
if( typeof data == "string" ) {
|
||||
if( typeof data === "string" ) {
|
||||
var transformed = {};
|
||||
$.each(data.split(/\s/), function() {
|
||||
transformed[this] = true;
|
||||
@@ -914,7 +968,7 @@ $.extend($.validator, {
|
||||
// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
|
||||
addMethod: function(name, method, message) {
|
||||
$.validator.methods[name] = method;
|
||||
$.validator.messages[name] = message != undefined ? message : $.validator.messages[name];
|
||||
$.validator.messages[name] = message !== undefined ? message : $.validator.messages[name];
|
||||
if (method.length < 3) {
|
||||
$.validator.addClassRules(name, $.validator.normalizeRule(name));
|
||||
}
|
||||
@@ -925,33 +979,34 @@ $.extend($.validator, {
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/required
|
||||
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;
|
||||
}
|
||||
if ( this.checkable(element) ) {
|
||||
return this.getLength(value, element) > 0;
|
||||
}
|
||||
return $.trim(value).length > 0;
|
||||
},
|
||||
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/remote
|
||||
remote: function(value, element, param) {
|
||||
if ( this.optional(element) )
|
||||
if ( this.optional(element) ) {
|
||||
return "dependency-mismatch";
|
||||
}
|
||||
|
||||
var previous = this.previousValue(element);
|
||||
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;
|
||||
|
||||
param = typeof param == "string" && {url:param} || param;
|
||||
param = typeof param === "string" && {url:param} || param;
|
||||
|
||||
if ( this.pending[element.name] ) {
|
||||
return "pending";
|
||||
@@ -973,17 +1028,19 @@ $.extend($.validator, {
|
||||
data: data,
|
||||
success: function(response) {
|
||||
validator.settings.messages[element.name].remote = previous.originalMessage;
|
||||
var valid = response === true;
|
||||
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;
|
||||
@@ -995,17 +1052,19 @@ $.extend($.validator, {
|
||||
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/minlength
|
||||
minlength: function(value, element, param) {
|
||||
return this.optional(element) || this.getLength($.trim(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) {
|
||||
return this.optional(element) || this.getLength($.trim(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 = this.getLength($.trim(value), element);
|
||||
var length = $.isArray( value ) ? value.length : this.getLength($.trim(value), element);
|
||||
return this.optional(element) || ( length >= param[0] && length <= param[1] );
|
||||
},
|
||||
|
||||
@@ -1043,12 +1102,12 @@ $.extend($.validator, {
|
||||
|
||||
// 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);
|
||||
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);
|
||||
return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value);
|
||||
},
|
||||
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/digits
|
||||
@@ -1059,11 +1118,13 @@ $.extend($.validator, {
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
|
||||
// based on http://en.wikipedia.org/wiki/Luhn
|
||||
creditcard: function(value, element) {
|
||||
if ( this.optional(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;
|
||||
@@ -1072,32 +1133,30 @@ $.extend($.validator, {
|
||||
|
||||
for (var n = value.length - 1; n >= 0; n--) {
|
||||
var cDigit = value.charAt(n);
|
||||
var nDigit = parseInt(cDigit, 10);
|
||||
nDigit = parseInt(cDigit, 10);
|
||||
if (bEven) {
|
||||
if ((nDigit *= 2) > 9)
|
||||
if ((nDigit *= 2) > 9) {
|
||||
nDigit -= 9;
|
||||
}
|
||||
}
|
||||
nCheck += nDigit;
|
||||
bEven = !bEven;
|
||||
}
|
||||
|
||||
return (nCheck % 10) == 0;
|
||||
},
|
||||
|
||||
// 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"));
|
||||
return (nCheck % 10) === 0;
|
||||
},
|
||||
|
||||
// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
|
||||
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();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1107,18 +1166,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) {
|
||||
var port = settings.port;
|
||||
if (settings.mode == "abort") {
|
||||
if (settings.mode === "abort") {
|
||||
if ( pendingRequests[port] ) {
|
||||
pendingRequests[port].abort();
|
||||
}
|
||||
@@ -1131,7 +1190,7 @@ $.format = $.validator.format;
|
||||
$.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();
|
||||
}
|
||||
@@ -1140,14 +1199,14 @@ $.format = $.validator.format;
|
||||
return ajax.apply(this, arguments);
|
||||
};
|
||||
}
|
||||
})(jQuery);
|
||||
}(jQuery));
|
||||
|
||||
// provides cross-browser focusin and focusout events
|
||||
// IE has native support, in other browsers, use event caputuring (neither bubbles)
|
||||
|
||||
// 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($) {
|
||||
(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) {
|
||||
@@ -1163,9 +1222,10 @@ $.format = $.validator.format;
|
||||
this.removeEventListener( original, handler, true );
|
||||
},
|
||||
handler: function(e) {
|
||||
arguments[0] = $.event.fix(e);
|
||||
arguments[0].type = fix;
|
||||
return $.event.handle.apply(this, arguments);
|
||||
var args = arguments;
|
||||
args[0] = $.event.fix(e);
|
||||
args[0].type = fix;
|
||||
return $.event.handle.apply(this, args);
|
||||
}
|
||||
};
|
||||
function handler(e) {
|
||||
@@ -1174,7 +1234,7 @@ $.format = $.validator.format;
|
||||
return $.event.handle.call(this, e);
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
$.extend($.fn, {
|
||||
validateDelegate: function(delegate, type, handler) {
|
||||
return this.bind(type, function(event) {
|
||||
@@ -1185,4 +1245,4 @@ $.format = $.validator.format;
|
||||
});
|
||||
}
|
||||
});
|
||||
})(jQuery);
|
||||
}(jQuery));
|
||||
|
||||
Reference in New Issue
Block a user