From 5bb2441f04c0d5bf5cd2824f3778cfca1ec1b6ee Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Wed, 5 May 2010 15:52:04 +0200 Subject: [PATCH] CRLF conversions --- additional-methods.js | 518 +- changelog.txt | 484 +- demo/captcha/captcha.js | 54 +- demo/captcha/image_req.php | 10 +- demo/captcha/index.php | 130 +- demo/captcha/newsession.php | 22 +- demo/captcha/process.php | 26 +- demo/captcha/rand.php | 20 +- demo/captcha/style.css | 20 +- demo/css/cmxform.css | 80 +- demo/css/cmxformTemplate.css | 108 +- demo/css/core.css | 26 +- demo/css/reset.css | 120 +- demo/css/screen.css | 20 +- demo/custom-messages-metadata-demo.html | 182 +- demo/custom-methods-demo.html | 4 +- demo/dynamic-totals.html | 110 +- demo/index.html | 14 +- demo/js/chili-1.7.pack.js | 2 +- demo/marketo/emails.php | 18 +- demo/marketo/emails.phps | 18 +- demo/marketo/ie6.css | 68 +- demo/marketo/index.html | 494 +- demo/marketo/jquery.maskedinput.js | 532 +- demo/marketo/mktSignup.js | 248 +- demo/marketo/step2.htm | 580 +- demo/milk/emails.php | 18 +- demo/milk/emails.phps | 18 +- demo/milk/milk.css | 8 +- demo/milk/users.php | 22 +- demo/milk/users.phps | 18 +- demo/multipart/index.html | 30 +- demo/multipart/js/jquery.maskedinput-1.0.js | 490 +- demo/multipart/style.css | 2 +- demo/tinymce/index.html | 150 +- demo/tinymce/themes/simple/langs/en.js | 20 +- .../themes/simple/skins/default/ui.css | 64 +- lib/jquery-1.4.2.js | 12480 ++++++++-------- lib/jquery.form.js | 1320 +- lib/jquery.js | 8750 +++++------ lib/jquery.metadata.js | 242 +- localization/messages_bg.js | 44 +- localization/messages_cn.js | 44 +- localization/messages_cs.js | 46 +- localization/messages_da.js | 40 +- localization/messages_de.js | 38 +- localization/messages_es.js | 44 +- localization/messages_fr.js | 44 +- localization/messages_hu.js | 40 +- localization/messages_kk.js | 44 +- localization/messages_nl.js | 44 +- localization/messages_no.js | 44 +- localization/messages_pl.js | 44 +- localization/messages_ptbr.js | 46 +- localization/messages_ptpt.js | 46 +- localization/messages_ro.js | 44 +- localization/messages_ru.js | 44 +- localization/messages_tr.js | 44 +- localization/messages_tw.js | 44 +- localization/messages_ua.js | 46 +- localization/methods_de.js | 22 +- localization/methods_nl.js | 16 +- localization/methods_pt.js | 16 +- test/events.html | 46 +- test/firebug/firebug.js | 1344 +- test/firebug/firebugx.js | 18 +- test/index-14.html | 46 +- test/index.html | 46 +- test/large.html | 44 +- test/messages.js | 122 +- test/methods.js | 1166 +- test/qunit/testrunner.js | 1606 +- test/qunit/testsuite.css | 240 +- test/rules.js | 534 +- test/test.js | 2178 +-- test/users.php | 20 +- test/users2.php | 20 +- todo | 342 +- 78 files changed, 18098 insertions(+), 18098 deletions(-) diff --git a/additional-methods.js b/additional-methods.js index db3ad14a7..7c18b67e8 100644 --- a/additional-methods.js +++ b/additional-methods.js @@ -1,259 +1,259 @@ -(function() { - - function stripHtml(value) { - // remove html tags and space chars - return value.replace(/<.[^<>]*?>/g, ' ').replace(/ | /gi, ' ') - // remove numbers and punctuation - .replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g,''); - } - jQuery.validator.addMethod("maxWords", function(value, element, params) { - return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length < params; - }, jQuery.validator.format("Please enter {0} words or less.")); - - jQuery.validator.addMethod("minWords", function(value, element, params) { - return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params; - }, jQuery.validator.format("Please enter at least {0} words.")); - - jQuery.validator.addMethod("rangeWords", function(value, element, params) { - return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params[0] && value.match(/bw+b/g).length < params[1]; - }, jQuery.validator.format("Please enter between {0} and {1} words.")); - -})(); - -jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) { - return this.optional(element) || /^[a-z-.,()'\"\s]+$/i.test(value); -}, "Letters or punctuation only please"); - -jQuery.validator.addMethod("alphanumeric", function(value, element) { - return this.optional(element) || /^\w+$/i.test(value); -}, "Letters, numbers, spaces or underscores only please"); - -jQuery.validator.addMethod("lettersonly", function(value, element) { - return this.optional(element) || /^[a-z]+$/i.test(value); -}, "Letters only please"); - -jQuery.validator.addMethod("nowhitespace", function(value, element) { - return this.optional(element) || /^\S+$/i.test(value); -}, "No white space please"); - -jQuery.validator.addMethod("ziprange", function(value, element) { - return this.optional(element) || /^90[2-5]\d\{2}-\d{4}$/.test(value); -}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"); - -jQuery.validator.addMethod("integer", function(value, element) { - return this.optional(element) || /^-?\d+$/.test(value); -}, "A positive or negative non-decimal number please"); - -/** -* Return true, if the value is a valid vehicle identification number (VIN). -* -* Works with all kind of text inputs. -* -* @example -* @desc Declares a required input element whose value must be a valid vehicle identification number. -* -* @name jQuery.validator.methods.vinUS -* @type Boolean -* @cat Plugins/Validate/Methods -*/ -jQuery.validator.addMethod( - "vinUS", - function(v){ - if (v.length != 17) - return false; - var i, n, d, f, cd, cdv; - var LL = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"]; - var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9]; - var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2]; - var rs = 0; - for(i = 0; i < 17; i++){ - f = FL[i]; - d = v.slice(i,i+1); - if(i == 8){ - cdv = d; - } - if(!isNaN(d)){ - d *= f; - } - else{ - for(n = 0; n < LL.length; n++){ - if(d.toUpperCase() === LL[n]){ - d = VL[n]; - d *= f; - if(isNaN(cdv) && n == 8){ - cdv = LL[n]; - } - break; - } - } - } - rs += d; - } - cd = rs % 11; - if(cd == 10){cd = "X";} - if(cd == cdv){return true;} - return false; - }, - "The specified vehicle identification number (VIN) is invalid." -); - -/** - * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy. - * - * @example jQuery.validator.methods.date("01/01/1900") - * @result true - * - * @example jQuery.validator.methods.date("01/13/1990") - * @result false - * - * @example jQuery.validator.methods.date("01.01.1900") - * @result false - * - * @example - * @desc Declares an optional input element whose value must be a valid date. - * - * @name jQuery.validator.methods.dateITA - * @type Boolean - * @cat Plugins/Validate/Methods - */ -jQuery.validator.addMethod( - "dateITA", - function(value, element) { - var check = false; - var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/; - if( re.test(value)){ - var adata = value.split('/'); - var gg = parseInt(adata[0],10); - var mm = parseInt(adata[1],10); - var aaaa = parseInt(adata[2],10); - var xdata = new Date(aaaa,mm-1,gg); - if ( ( xdata.getFullYear() == aaaa ) && ( xdata.getMonth () == mm - 1 ) && ( xdata.getDate() == gg ) ) - check = true; - else - check = false; - } else - check = false; - return this.optional(element) || check; - }, - "Please enter a correct date" -); - -jQuery.validator.addMethod("dateNL", function(value, element) { - return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value); - }, "Vul hier een geldige datum in." -); - -jQuery.validator.addMethod("time", function(value, element) { - return this.optional(element) || /^([01][0-9])|(2[0123]):([0-5])([0-9])$/.test(value); - }, "Please enter a valid time, between 00:00 and 23:59" -); - -/** - * matches US phone number format - * - * where the area code may not start with 1 and the prefix may not start with 1 - * allows '-' or ' ' as a separator and allows parens around area code - * some people may want to put a '1' in front of their number - * - * 1(212)-999-2345 - * or - * 212 999 2344 - * or - * 212-999-0983 - * - * but not - * 111-123-5434 - * and not - * 212 123 4567 - */ -jQuery.validator.addMethod("phoneUS", function(phone_number, element) { - phone_number = phone_number.replace(/\s+/g, ""); - return this.optional(element) || phone_number.length > 9 && - phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/); -}, "Please specify a valid phone number"); - -jQuery.validator.addMethod('phoneUK', function(phone_number, element) { -return this.optional(element) || phone_number.length > 9 && -phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/); -}, 'Please specify a valid phone number'); - -jQuery.validator.addMethod('mobileUK', function(phone_number, element) { -return this.optional(element) || phone_number.length > 9 && -phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/); -}, 'Please specify a valid mobile number'); - -// TODO check if value starts with <, otherwise don't try stripping anything -jQuery.validator.addMethod("strippedminlength", function(value, element, param) { - return jQuery(value).text().length >= param; -}, jQuery.validator.format("Please enter at least {0} characters")); - -// same as email, but TLD is optional -jQuery.validator.addMethod("email2", function(value, element, param) { - 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); -}, jQuery.validator.messages.email); - -// same as url, but TLD is optional -jQuery.validator.addMethod("url2", function(value, element, param) { - 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); -}, jQuery.validator.messages.url); - -// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator -// Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0 -// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings) -jQuery.validator.addMethod("creditcardtypes", function(value, element, param) { - - if (/[^0-9-]+/.test(value)) - return false; - - value = value.replace(/\D/g, ""); - - var validTypes = 0x0000; - - if (param.mastercard) - validTypes |= 0x0001; - if (param.visa) - validTypes |= 0x0002; - if (param.amex) - validTypes |= 0x0004; - if (param.dinersclub) - validTypes |= 0x0008; - if (param.enroute) - validTypes |= 0x0010; - if (param.discover) - validTypes |= 0x0020; - if (param.jcb) - validTypes |= 0x0040; - if (param.unknown) - validTypes |= 0x0080; - if (param.all) - validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080; - - if (validTypes & 0x0001 && /^(51|52|53|54|55)/.test(value)) { //mastercard - return value.length == 16; - } - if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa - return value.length == 16; - } - if (validTypes & 0x0004 && /^(34|37)/.test(value)) { //amex - return value.length == 15; - } - if (validTypes & 0x0008 && /^(300|301|302|303|304|305|36|38)/.test(value)) { //dinersclub - return value.length == 14; - } - if (validTypes & 0x0010 && /^(2014|2149)/.test(value)) { //enroute - return value.length == 15; - } - if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover - return value.length == 16; - } - if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb - return value.length == 16; - } - if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb - return value.length == 15; - } - if (validTypes & 0x0080) { //unknown - return true; - } - return false; -}, "Please enter a valid credit card number."); +(function() { + + function stripHtml(value) { + // remove html tags and space chars + return value.replace(/<.[^<>]*?>/g, ' ').replace(/ | /gi, ' ') + // remove numbers and punctuation + .replace(/[0-9.(),;:!?%#$'"_+=\/-]*/g,''); + } + jQuery.validator.addMethod("maxWords", function(value, element, params) { + return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length < params; + }, jQuery.validator.format("Please enter {0} words or less.")); + + jQuery.validator.addMethod("minWords", function(value, element, params) { + return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params; + }, jQuery.validator.format("Please enter at least {0} words.")); + + jQuery.validator.addMethod("rangeWords", function(value, element, params) { + return this.optional(element) || stripHtml(value).match(/\b\w+\b/g).length >= params[0] && value.match(/bw+b/g).length < params[1]; + }, jQuery.validator.format("Please enter between {0} and {1} words.")); + +})(); + +jQuery.validator.addMethod("letterswithbasicpunc", function(value, element) { + return this.optional(element) || /^[a-z-.,()'\"\s]+$/i.test(value); +}, "Letters or punctuation only please"); + +jQuery.validator.addMethod("alphanumeric", function(value, element) { + return this.optional(element) || /^\w+$/i.test(value); +}, "Letters, numbers, spaces or underscores only please"); + +jQuery.validator.addMethod("lettersonly", function(value, element) { + return this.optional(element) || /^[a-z]+$/i.test(value); +}, "Letters only please"); + +jQuery.validator.addMethod("nowhitespace", function(value, element) { + return this.optional(element) || /^\S+$/i.test(value); +}, "No white space please"); + +jQuery.validator.addMethod("ziprange", function(value, element) { + return this.optional(element) || /^90[2-5]\d\{2}-\d{4}$/.test(value); +}, "Your ZIP-code must be in the range 902xx-xxxx to 905-xx-xxxx"); + +jQuery.validator.addMethod("integer", function(value, element) { + return this.optional(element) || /^-?\d+$/.test(value); +}, "A positive or negative non-decimal number please"); + +/** +* Return true, if the value is a valid vehicle identification number (VIN). +* +* Works with all kind of text inputs. +* +* @example +* @desc Declares a required input element whose value must be a valid vehicle identification number. +* +* @name jQuery.validator.methods.vinUS +* @type Boolean +* @cat Plugins/Validate/Methods +*/ +jQuery.validator.addMethod( + "vinUS", + function(v){ + if (v.length != 17) + return false; + var i, n, d, f, cd, cdv; + var LL = ["A","B","C","D","E","F","G","H","J","K","L","M","N","P","R","S","T","U","V","W","X","Y","Z"]; + var VL = [1,2,3,4,5,6,7,8,1,2,3,4,5,7,9,2,3,4,5,6,7,8,9]; + var FL = [8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2]; + var rs = 0; + for(i = 0; i < 17; i++){ + f = FL[i]; + d = v.slice(i,i+1); + if(i == 8){ + cdv = d; + } + if(!isNaN(d)){ + d *= f; + } + else{ + for(n = 0; n < LL.length; n++){ + if(d.toUpperCase() === LL[n]){ + d = VL[n]; + d *= f; + if(isNaN(cdv) && n == 8){ + cdv = LL[n]; + } + break; + } + } + } + rs += d; + } + cd = rs % 11; + if(cd == 10){cd = "X";} + if(cd == cdv){return true;} + return false; + }, + "The specified vehicle identification number (VIN) is invalid." +); + +/** + * Return true, if the value is a valid date, also making this formal check dd/mm/yyyy. + * + * @example jQuery.validator.methods.date("01/01/1900") + * @result true + * + * @example jQuery.validator.methods.date("01/13/1990") + * @result false + * + * @example jQuery.validator.methods.date("01.01.1900") + * @result false + * + * @example + * @desc Declares an optional input element whose value must be a valid date. + * + * @name jQuery.validator.methods.dateITA + * @type Boolean + * @cat Plugins/Validate/Methods + */ +jQuery.validator.addMethod( + "dateITA", + function(value, element) { + var check = false; + var re = /^\d{1,2}\/\d{1,2}\/\d{4}$/; + if( re.test(value)){ + var adata = value.split('/'); + var gg = parseInt(adata[0],10); + var mm = parseInt(adata[1],10); + var aaaa = parseInt(adata[2],10); + var xdata = new Date(aaaa,mm-1,gg); + if ( ( xdata.getFullYear() == aaaa ) && ( xdata.getMonth () == mm - 1 ) && ( xdata.getDate() == gg ) ) + check = true; + else + check = false; + } else + check = false; + return this.optional(element) || check; + }, + "Please enter a correct date" +); + +jQuery.validator.addMethod("dateNL", function(value, element) { + return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value); + }, "Vul hier een geldige datum in." +); + +jQuery.validator.addMethod("time", function(value, element) { + return this.optional(element) || /^([01][0-9])|(2[0123]):([0-5])([0-9])$/.test(value); + }, "Please enter a valid time, between 00:00 and 23:59" +); + +/** + * matches US phone number format + * + * where the area code may not start with 1 and the prefix may not start with 1 + * allows '-' or ' ' as a separator and allows parens around area code + * some people may want to put a '1' in front of their number + * + * 1(212)-999-2345 + * or + * 212 999 2344 + * or + * 212-999-0983 + * + * but not + * 111-123-5434 + * and not + * 212 123 4567 + */ +jQuery.validator.addMethod("phoneUS", function(phone_number, element) { + phone_number = phone_number.replace(/\s+/g, ""); + return this.optional(element) || phone_number.length > 9 && + phone_number.match(/^(1-?)?(\([2-9]\d{2}\)|[2-9]\d{2})-?[2-9]\d{2}-?\d{4}$/); +}, "Please specify a valid phone number"); + +jQuery.validator.addMethod('phoneUK', function(phone_number, element) { +return this.optional(element) || phone_number.length > 9 && +phone_number.match(/^(\(?(0|\+44)[1-9]{1}\d{1,4}?\)?\s?\d{3,4}\s?\d{3,4})$/); +}, 'Please specify a valid phone number'); + +jQuery.validator.addMethod('mobileUK', function(phone_number, element) { +return this.optional(element) || phone_number.length > 9 && +phone_number.match(/^((0|\+44)7(5|6|7|8|9){1}\d{2}\s?\d{6})$/); +}, 'Please specify a valid mobile number'); + +// TODO check if value starts with <, otherwise don't try stripping anything +jQuery.validator.addMethod("strippedminlength", function(value, element, param) { + return jQuery(value).text().length >= param; +}, jQuery.validator.format("Please enter at least {0} characters")); + +// same as email, but TLD is optional +jQuery.validator.addMethod("email2", function(value, element, param) { + 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); +}, jQuery.validator.messages.email); + +// same as url, but TLD is optional +jQuery.validator.addMethod("url2", function(value, element, param) { + 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); +}, jQuery.validator.messages.url); + +// NOTICE: Modified version of Castle.Components.Validator.CreditCardValidator +// Redistributed under the the Apache License 2.0 at http://www.apache.org/licenses/LICENSE-2.0 +// Valid Types: mastercard, visa, amex, dinersclub, enroute, discover, jcb, unknown, all (overrides all other settings) +jQuery.validator.addMethod("creditcardtypes", function(value, element, param) { + + if (/[^0-9-]+/.test(value)) + return false; + + value = value.replace(/\D/g, ""); + + var validTypes = 0x0000; + + if (param.mastercard) + validTypes |= 0x0001; + if (param.visa) + validTypes |= 0x0002; + if (param.amex) + validTypes |= 0x0004; + if (param.dinersclub) + validTypes |= 0x0008; + if (param.enroute) + validTypes |= 0x0010; + if (param.discover) + validTypes |= 0x0020; + if (param.jcb) + validTypes |= 0x0040; + if (param.unknown) + validTypes |= 0x0080; + if (param.all) + validTypes = 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080; + + if (validTypes & 0x0001 && /^(51|52|53|54|55)/.test(value)) { //mastercard + return value.length == 16; + } + if (validTypes & 0x0002 && /^(4)/.test(value)) { //visa + return value.length == 16; + } + if (validTypes & 0x0004 && /^(34|37)/.test(value)) { //amex + return value.length == 15; + } + if (validTypes & 0x0008 && /^(300|301|302|303|304|305|36|38)/.test(value)) { //dinersclub + return value.length == 14; + } + if (validTypes & 0x0010 && /^(2014|2149)/.test(value)) { //enroute + return value.length == 15; + } + if (validTypes & 0x0020 && /^(6011)/.test(value)) { //discover + return value.length == 16; + } + if (validTypes & 0x0040 && /^(3)/.test(value)) { //jcb + return value.length == 16; + } + if (validTypes & 0x0040 && /^(2131|1800)/.test(value)) { //jcb + return value.length == 15; + } + if (validTypes & 0x0080) { //unknown + return true; + } + return false; +}, "Please enter a valid credit card number."); diff --git a/changelog.txt b/changelog.txt index 3c265b575..f45c91b69 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,243 +1,243 @@ -1.x ---- -* Improved NL localization (http://plugins.jquery.com/node/14120) - -1.7 ---- -* Added Lithuanian (LT) localization -* Added Greek (EL) localization (http://plugins.jquery.com/node/12319) -* Added Latvian (LV) localization (http://plugins.jquery.com/node/12349) -* Added Hebrew (HE) localization (http://plugins.jquery.com/node/12039) -* Fixed Spanish (ES) localization (http://plugins.jquery.com/node/12696) -* Added jQuery UI themerolled demo -* Removed cmxform.js -* Fixed four missing semicolons (http://plugins.jquery.com/node/12639) -* Renamed phone-method in additional-methods.js to phoneUS -* Added phoneUK and mobileUK methods to additional-methods.js (http://plugins.jquery.com/node/12359) -* Deep extend options to avoid modifying multiple forms when using the rules-method on a single element (http://plugins.jquery.com/node/12411) -* Bugfixes for compability with jQuery 1.4.2, while maintaining backwards-compability - -1.6 ---- -* Added Arabic (AR), Portuguese (PTPT), Persian (FA), Finnish (FI) and Bulgarian (BR) localization -* Updated Swedish (SE) localization (some missing html iso characters) -* Fixed $.validator.addMethod to properly handle empty string vs. undefined for the message argument -* Fixed two accidental global variables -* Enhanced min/max/rangeWords (in additional-methods.js) to strip html before counting; good when counting words in a richtext editor -* Added localized methods for DE, NL and PT, removing the dateDE and numberDE methods (use messages_de.js and methods_de.js with date and number methods instead) -* Fixed remote form submit synchronization, kudos to Matas Petrikas -* Improved interactive select validation, now validating also on click (via option or select, inconsistent across browsers); doesn't work in Safari, which doesn't trigger a click event at all on select elements; fixes http://plugins.jquery.com/node/11520 -* Updated to latest form plugin (2.36), fixing http://plugins.jquery.com/node/11487 -* Bind to blur event for equalTo target to revalidate when that target changes, fixes http://plugins.jquery.com/node/11450 -* Simplified select validation, delegating to jQuery's val() method to get the select value; should fix http://plugins.jquery.com/node/11239 -* Fixed default message for digits (http://plugins.jquery.com/node/9853) -* Fixed issue with cached remote message (http://plugins.jquery.com/node/11029 and http://plugins.jquery.com/node/9351) -* Fixed a missing semicolon in additional-methods.js (http://plugins.jquery.com/node/9233) -* Added automatic detection of substitution parameters in messages, removing the need to provide format functions (http://plugins.jquery.com/node/11195) -* Fixed an issue with :filled/:blank somewhat caused by Sizzle (http://plugins.jquery.com/node/11144) -* Added an integer method to additional-methods.js (http://plugins.jquery.com/node/9612) -* Fixed errorsFor method where the for-attribute contains characters that need escaping to be valid inside a selector (http://plugins.jquery.com/node/9611) - -1.5.5 ---- -* Fix for http://plugins.jquery.com/node/8659 -* Fixed trailing comma in messages_cs.js - -1.5.4 ---- -* Fixed remote method bug (http://plugins.jquery.com/node/8658) - -1.5.3 ---- -* Fixed a bug related to the wrapper-option, where all ancestor-elements that matched the wrapper-option where selected (http://plugins.jquery.com/node/7624) -* Updated multipart demo to use latest jQuery UI accordion -* Added dateNL and time methods to additionalMethods.js -* Added Traditional Chinese (Taiwan, tw) and Kazakhstan (KK) localization -* Moved jQuery.format (fomerly String.format) to jQuery.validator.format, jQuery.format is deprecated and will be removed in 1.6 (see http://code.google.com/p/jquery-utils/issues/detail?id=15 for details) -* Cleaned up messages_pl.js and messages_ptbr.js (still defined messages for max/min/rangeValue, which were removed in 1.4) -* Fixed flawed boolean logic in valid-plugin-method for multiple elements; now all elements need to be valid for a boolean-true result (http://plugins.jquery.com/node/8481) -* Enhancement $.validator.addMethod: An undefined third message-argument won't overwrite an existing message (http://plugins.jquery.com/node/8443) -* Enhancement to submitHandler option: When used, click events on submit buttons are captured and the submitting button is inserted into the form before calling submitHandler, and removed afterwards; keeps submit buttons intact (http://plugins.jquery.com/node/7183#comment-3585) -* Added option validClass, default "valid", which adds that class to all valid elements, after validation (http://dev.jquery.com/ticket/2205) -* Added creditcardtypes method to additionalMethods.js, including tests (via http://dev.jquery.com/ticket/3635) -* Improved remote method to allow serverside message as a string, or true for valid, or false for invalid using the clientside defined message (http://dev.jquery.com/ticket/3807) -* Improved accept method to also accept a Drupal-style comma-seperated list of values (http://plugins.jquery.com/node/8580) - -1.5.2 ---- -* Fixed messages in additional-methods.js for maxWords, minWords, and rangeWords to include call to $.format -* Fixed value passed to methods to exclude carriage return (\r), same as jQuery's val() does -* Added slovak (sk) localization -* Added demo for intergration with jQuery UI tabs -* Added selects-grouping example to tabs demo (see second tab, birthdate field) - -1.5.1 ---- -* Updated marketo demo to use invalidHandler option instead of binding invalid-form event -* Added TinyMCE integration example -* Added ukrainian (ua) localization -* Fixed length validation to work with trimmed value (regression from 1.5 where general trimming before validation was removed) -* Various small fixes for compability with both 1.2.6 and 1.3 - -1.5 ---- -* Improved basic demo, validating confirm-password field after password changed -* Fixed basic validation to pass the untrimmed input value as the first parameter to validation methods, changed required accordingly; breaks existing custom method that rely on the trimming -* Added norwegian (no), italian (it), hungarian (hu) and romanian (ro) localization -* Fixed #3195: Two flaws in swedish localization -* Fixed #3503: Extended rules("add") to accept messages propery: use to specify add custom messages to an element via rules("add", { messages: { required: "Required! " } }); -* Fixed #3356: Regression from #2908 when using meta-option -* Fixed #3370: Added ignoreTitle option, set to skip reading messages from the title attribute, helps to avoid issues with Google Toolbar; default is false for compability -* Fixed #3516: Trigger invalid-form event even when remote validation is involved -* Added invalidHandler option as a shortcut to bind("invalid-form", function() {}) -* Fixed Safari issue for loading indicator in ajaxSubmit-integration-demo (append to body first, then hide) -* Added test for creditcard validation and improved default message -* Enhanced remote validation, accepting options to passthrough to $.ajax as paramter (either url string or options, including url property plus everything else that $.ajax supports) - -1.4 ---- -* Fixed #2931, validate elements in document order and ignore type=image inputs -* Fixed usage of $ and jQuery variables, now fully comptible with all variations of noConflict usage -* Implemented #2908, enabling custom messages via metadata ala class="{required:true,messages:{required:'required field'}}", added demo/custom-messages-metadata-demo.html -* Removed deprecated methods minValue (min), maxValue (max), rangeValue (rangevalue), minLength (minlength), maxLength (maxlength), rangeLength (rangelength) -* Fixed #2215 regression: Call unhighlight only for current elements, not everything -* Implemented #2989, enabling image button to cancel validation -* Fixed issue where IE incorrectly validates against maxlength=0 -* Added czech (cs) localization -* Reset validator.submitted on validator.resetForm(), enabling a full reset when necessary -* Fixed #3035, skipping all falsy attributes when reading rules (0, undefined, empty string), removed part of the maxlength workaround (for 0) -* Added dutch (nl) localization (#3201) - -1.3 ---- -* Fixed invalid-form event, now only triggered when form is invalid -* Added spanish (es), russian (ru), portuguese brazilian (ptbr), turkish (tr), and polish (pl) localization -* Added removeAttrs plugin to facilate adding and removing multiple attributes -* Added groups option to display a single message for multiple elements, via groups: { arbitraryGroupName: "fieldName1 fieldName2[, fieldNameN" } -* Enhanced rules() for adding and removing (static) rules: rules("add", "method1[, methodN]"/{method1:param[, method_n:param]}) and rules("remove"[, "method1[, method_n]") -* Enhanced rules-option, accepts space-seperated string-list of methods, eg. {birthdate: "required date"} -* Fixed checkbox group validation with inline rules: As long as the rules are specified on the first element, the group is now properly validated on click -* Fixed #2473, ignoring all rules with an explicit parameter of boolean-false, eg. required:false is the same as not specifying required at all (it was handled as required:true so far) -* Fixed #2424, with a modified patch from #2473: Methods returning a dependency-mismatch don't stop other rules from being evaluated anymore; still, success isn't applied for optional fields -* Fixed url and email validation to not use trimmed values -* Fixed creditcard validation to accept only digits and dashes ("asdf" is not a valid creditcard number) -* Allow both button and input elements for cancel buttons (via class="cancel") -* Fixed #2215: Fixed message display to call unhighlight as part of showing and hiding messages, no more visual side-effects while checking an element and extracted validator.checkForm to validate a form without UI sideeffects -* Rewrote custom selectors (:blank, :filled, :unchecked) with functions for compability with AIR - -1.2.1 ------ - -* Bundled delegeate plugin with validate plugin - its always required anyway -* Improved remote validation to include parts from the ajaxQueue plugin for proper synchronization (no additional plugin necessary) -* Fixed stopRequest to prevent pendingRequest < 0 -* Added jQuery.validator.autoCreateRanges property, defaults to false, enable to convert min/max to range and minlength/maxlength to rangelength; this basically fixes the issue introduced by automatically creating ranges in 1.2 -* Fixed optional-methods to not highlight anything at all if the field is blank, that is, don't trigger success -* Allow false/null for highlight/unhighlight options instead of forcing a do-nothing-callback even when nothing needs to be highlighted -* Fixed validate() call with no elements selected, returning undefined instead of throwing an error -* Improved demo, replacing metadata with classes/attributes for specifying rules -* Fixed error when no custom message is used for remote validation -* Modified email and url validation to require domain label and top label -* Fixed url and email validation to require TLD (actually to require domain label); 1.2 version (TLD is optional) is moved to additionals as url2 and email2 -* Fixed dynamic-totals demo in IE6/7 and improved templating, using textarea to store multiline template and string interpolation -* Added login form example with "Email password" link that makes the password field optional -* Enhanced dynamic-totals demo with an example of a single message for two fields - -1.2 ---- - -* Added AJAX-captcha validation example (based on http://psyrens.com/captcha/) -* Added remember-the-milk-demo (thanks RTM team for the permission!) -* Added marketo-demo (thanks Glen Lipka!) -* Added support for ajax-validation, see method "remote"; serverside returns JSON, true for valid elements, false or a String for invalid, String is used as message -* Added highlight and unhighlight options, by default toggles errorClass on element, allows custom highlighting -* Added valid() plugin method for easy programmatic checking of forms and fields without the need to use the validator API -* Added rules() plguin method to read and write rules for an element (currently read only) -* Replaced regex for email method, thanks to the contribution by Scott Gonzalez, see http://projects.scottsplayground.com/email_address_validation/ -* Restructured event architecture to rely solely on delegation, both improving performance, and ease-of-use for the developer (requires jquery.delegate.js) -* Moved documentation from inline to http://docs.jquery.com/Plugins/Validation - including interactive examples for all methods -* Removed validator.refresh(), validation is now completey dynamic -* Renamed minValue to min, maxValue to max and rangeValue to range, deprecating the previous names (to be removed in 1.3) -* Renamed minLength to minlength, maxLength to maxlength and rangeLength to rangelength, deprecating the previous names (to be removed in 1.3) -* Added feature to merge min + max into and range and minlength + maxlength into rangelength -* Added support for dynamic rule parameters, allowing to specify a function as a parameter eg. for minlength, called when validating the element -* Allow to specify null or an empty string as a message to display nothing (see marketo demo) -* Rules overhaul: Now supports combination of rules-option, metadata, classes (new) and attributes (new), see rules() for details - -1.1.2 ---- - -* Replaced regex for URL method, thanks to the contribution by Scott Gonzalez, see http://projects.scottsplayground.com/iri/ -* Improved email method to better handle unicode characters -* Fixed error container to hide when all elements are valid, not only on form submit -* Fixed String.format to jQuery.format (moving into jQuery namespace) -* Fixed accept method to accept both upper and lowercase extensions -* Fixed validate() plugin method to create only one validator instance for a given form and always return that one instance (avoids binding events multiple times) -* Changed debug-mode console log from "error" to "warn" level - -1.1.1 ------ - -* Fixed invalid XHTML, preventing error label creation in IE since jQuery 1.1.4 -* Fixed and improved String.format: Global search & replace, better handling of array arguments -* Fixed cancel-button handling to use validator-object for storing state instead of form element -* Fixed name selectors to handle "complex" names, eg. containing brackets ("list[]") -* Added button and disabled elements to exclude from validation -* Moved element event handlers to refresh to be able to add handlers to new elements -* Fixed email validation to allow long top level domains (eg. ".travel") -* Moved showErrors() from valid() to form() -* Added validator.size(): returns the number of current errors -* Call submitHandler with validator as scope for easier access of it's methods, eg. to find error labels using errorsFor(Element) -* Compatible with jQuery 1.1.x and 1.2.x - -1.1 ---- - -* Added validation on blur, keyup and click (for checkboxes and radiobutton). Replaces event-option. -* Fixed resetForm -* Fixed custom-methods-demo - -1.0 ---- - -* Improved number and numberDE methods to check for correct decimal numbers with delimiters -* Only elements that have rules are checked (otherwise success-option is applied to all elements) -* Added creditcard number method (thanks to Brian Klug) -* Added ignore-option, eg. ignore: "[@type=hidden]", using that expression to exclude elements to validate. Default: none, though submit and reset buttons are always ignored -* Heavily enhanced Functions-as-messages by providing a flexible String.format helper -* Accept Functions as messages, providing runtime-custom-messages -* Fixed exclusion of elements without rules from successList -* Fixed custom-method-demo, replaced the alert with message displaying the number of errors -* Fixed form-submit-prevention when using submitHandler -* Completely removed dependency on element IDs, though they are still used (when present) to link error labels to inputs. Achieved by using - an array with {name, message, element} instead of an object with id:message pairs for the internal errorList. -* Added support for specifying simple rules as simple strings, eg. "required" is equivalent to {required: true} -* Added feature: Add errorClass to invalid field�s parent element, making it easy to style the label/field container or the label for the field. -* Added feature: focusCleanup - If enabled, removes the errorClass from the invalid elements and hides all errors messages whenever the element is focused. -* Added success option to show the a field was validated successfully -* Fixed Opera select-issue (avoiding a attribute-collision) -* Fixed problems with focussing hidden elements in IE -* Added feature to skip validation for submit buttons with class "cancel" -* Fixed potential issues with Google Toolbar by prefering plugin option messages over title attribute -* submitHandler is only called when an actual submit event was handled, validator.form() returns false only for invalid forms -* Invalid elements are now focused only on submit or via validator.focusInvalid(), avoiding all trouble with focus-on-blur -* IE6 error container layout issue is solved -* Customize error element via errorElement option -* Added validator.refresh() to find new inputs in the form -* Added accept validation method, checks file extensions -* Improved dependecy feature by adding two custom expressions: ":blank" to select elements with an empty value and �:filled� to select elements with a value, both excluding whitespace -* Added a resetForm() method to the validator: Resets each form element (using the form plugin, if available), removes classes on invalid elements and hides all error messages -* Fixed docs for validator.showErrors() -* Fixed error label creation to always use html() instead of text(), allowing arbitrary HTML passed in as messages -* Fixed error label creation to use specified error class -* Added dependency feature: The requires method accepts both String (jQuery expressions) and Functions as the argument -* Heavily improved customizing of error message display: Use normal messages and show/hide an additional container; Completely replace message display with own mechanism (while being able to delegate to the default handler; Customize placing of generated labels (instead of default below-element) -* Fixed two major bugs in IE (error containers) and Opera (metadata) -* Modified validation methods to accept empty fields as valid (exception: of course �required� and also �equalTo� methods) -* Renamed "min" to "minLength", "max" to "maxLength", "length" to "rangeLength" -* Added "minValue", "maxValue" and "rangeValue" -* Streamlined API for support of different events. The default, submit, can be disabled. If any event is specified, that is applied to each element (instead of the entire form). Combining keyup-validation with submit-validation is now extremely easy to setup -* Added support for one-message-per-rule when defining messages via plugin settings -* Added support to wrap metadata in some parent element. Useful when metadata is used for other plugins, too. -* Refactored tests and demos: Less files, better demos +1.x +--- +* Improved NL localization (http://plugins.jquery.com/node/14120) + +1.7 +--- +* Added Lithuanian (LT) localization +* Added Greek (EL) localization (http://plugins.jquery.com/node/12319) +* Added Latvian (LV) localization (http://plugins.jquery.com/node/12349) +* Added Hebrew (HE) localization (http://plugins.jquery.com/node/12039) +* Fixed Spanish (ES) localization (http://plugins.jquery.com/node/12696) +* Added jQuery UI themerolled demo +* Removed cmxform.js +* Fixed four missing semicolons (http://plugins.jquery.com/node/12639) +* Renamed phone-method in additional-methods.js to phoneUS +* Added phoneUK and mobileUK methods to additional-methods.js (http://plugins.jquery.com/node/12359) +* Deep extend options to avoid modifying multiple forms when using the rules-method on a single element (http://plugins.jquery.com/node/12411) +* Bugfixes for compability with jQuery 1.4.2, while maintaining backwards-compability + +1.6 +--- +* Added Arabic (AR), Portuguese (PTPT), Persian (FA), Finnish (FI) and Bulgarian (BR) localization +* Updated Swedish (SE) localization (some missing html iso characters) +* Fixed $.validator.addMethod to properly handle empty string vs. undefined for the message argument +* Fixed two accidental global variables +* Enhanced min/max/rangeWords (in additional-methods.js) to strip html before counting; good when counting words in a richtext editor +* Added localized methods for DE, NL and PT, removing the dateDE and numberDE methods (use messages_de.js and methods_de.js with date and number methods instead) +* Fixed remote form submit synchronization, kudos to Matas Petrikas +* Improved interactive select validation, now validating also on click (via option or select, inconsistent across browsers); doesn't work in Safari, which doesn't trigger a click event at all on select elements; fixes http://plugins.jquery.com/node/11520 +* Updated to latest form plugin (2.36), fixing http://plugins.jquery.com/node/11487 +* Bind to blur event for equalTo target to revalidate when that target changes, fixes http://plugins.jquery.com/node/11450 +* Simplified select validation, delegating to jQuery's val() method to get the select value; should fix http://plugins.jquery.com/node/11239 +* Fixed default message for digits (http://plugins.jquery.com/node/9853) +* Fixed issue with cached remote message (http://plugins.jquery.com/node/11029 and http://plugins.jquery.com/node/9351) +* Fixed a missing semicolon in additional-methods.js (http://plugins.jquery.com/node/9233) +* Added automatic detection of substitution parameters in messages, removing the need to provide format functions (http://plugins.jquery.com/node/11195) +* Fixed an issue with :filled/:blank somewhat caused by Sizzle (http://plugins.jquery.com/node/11144) +* Added an integer method to additional-methods.js (http://plugins.jquery.com/node/9612) +* Fixed errorsFor method where the for-attribute contains characters that need escaping to be valid inside a selector (http://plugins.jquery.com/node/9611) + +1.5.5 +--- +* Fix for http://plugins.jquery.com/node/8659 +* Fixed trailing comma in messages_cs.js + +1.5.4 +--- +* Fixed remote method bug (http://plugins.jquery.com/node/8658) + +1.5.3 +--- +* Fixed a bug related to the wrapper-option, where all ancestor-elements that matched the wrapper-option where selected (http://plugins.jquery.com/node/7624) +* Updated multipart demo to use latest jQuery UI accordion +* Added dateNL and time methods to additionalMethods.js +* Added Traditional Chinese (Taiwan, tw) and Kazakhstan (KK) localization +* Moved jQuery.format (fomerly String.format) to jQuery.validator.format, jQuery.format is deprecated and will be removed in 1.6 (see http://code.google.com/p/jquery-utils/issues/detail?id=15 for details) +* Cleaned up messages_pl.js and messages_ptbr.js (still defined messages for max/min/rangeValue, which were removed in 1.4) +* Fixed flawed boolean logic in valid-plugin-method for multiple elements; now all elements need to be valid for a boolean-true result (http://plugins.jquery.com/node/8481) +* Enhancement $.validator.addMethod: An undefined third message-argument won't overwrite an existing message (http://plugins.jquery.com/node/8443) +* Enhancement to submitHandler option: When used, click events on submit buttons are captured and the submitting button is inserted into the form before calling submitHandler, and removed afterwards; keeps submit buttons intact (http://plugins.jquery.com/node/7183#comment-3585) +* Added option validClass, default "valid", which adds that class to all valid elements, after validation (http://dev.jquery.com/ticket/2205) +* Added creditcardtypes method to additionalMethods.js, including tests (via http://dev.jquery.com/ticket/3635) +* Improved remote method to allow serverside message as a string, or true for valid, or false for invalid using the clientside defined message (http://dev.jquery.com/ticket/3807) +* Improved accept method to also accept a Drupal-style comma-seperated list of values (http://plugins.jquery.com/node/8580) + +1.5.2 +--- +* Fixed messages in additional-methods.js for maxWords, minWords, and rangeWords to include call to $.format +* Fixed value passed to methods to exclude carriage return (\r), same as jQuery's val() does +* Added slovak (sk) localization +* Added demo for intergration with jQuery UI tabs +* Added selects-grouping example to tabs demo (see second tab, birthdate field) + +1.5.1 +--- +* Updated marketo demo to use invalidHandler option instead of binding invalid-form event +* Added TinyMCE integration example +* Added ukrainian (ua) localization +* Fixed length validation to work with trimmed value (regression from 1.5 where general trimming before validation was removed) +* Various small fixes for compability with both 1.2.6 and 1.3 + +1.5 +--- +* Improved basic demo, validating confirm-password field after password changed +* Fixed basic validation to pass the untrimmed input value as the first parameter to validation methods, changed required accordingly; breaks existing custom method that rely on the trimming +* Added norwegian (no), italian (it), hungarian (hu) and romanian (ro) localization +* Fixed #3195: Two flaws in swedish localization +* Fixed #3503: Extended rules("add") to accept messages propery: use to specify add custom messages to an element via rules("add", { messages: { required: "Required! " } }); +* Fixed #3356: Regression from #2908 when using meta-option +* Fixed #3370: Added ignoreTitle option, set to skip reading messages from the title attribute, helps to avoid issues with Google Toolbar; default is false for compability +* Fixed #3516: Trigger invalid-form event even when remote validation is involved +* Added invalidHandler option as a shortcut to bind("invalid-form", function() {}) +* Fixed Safari issue for loading indicator in ajaxSubmit-integration-demo (append to body first, then hide) +* Added test for creditcard validation and improved default message +* Enhanced remote validation, accepting options to passthrough to $.ajax as paramter (either url string or options, including url property plus everything else that $.ajax supports) + +1.4 +--- +* Fixed #2931, validate elements in document order and ignore type=image inputs +* Fixed usage of $ and jQuery variables, now fully comptible with all variations of noConflict usage +* Implemented #2908, enabling custom messages via metadata ala class="{required:true,messages:{required:'required field'}}", added demo/custom-messages-metadata-demo.html +* Removed deprecated methods minValue (min), maxValue (max), rangeValue (rangevalue), minLength (minlength), maxLength (maxlength), rangeLength (rangelength) +* Fixed #2215 regression: Call unhighlight only for current elements, not everything +* Implemented #2989, enabling image button to cancel validation +* Fixed issue where IE incorrectly validates against maxlength=0 +* Added czech (cs) localization +* Reset validator.submitted on validator.resetForm(), enabling a full reset when necessary +* Fixed #3035, skipping all falsy attributes when reading rules (0, undefined, empty string), removed part of the maxlength workaround (for 0) +* Added dutch (nl) localization (#3201) + +1.3 +--- +* Fixed invalid-form event, now only triggered when form is invalid +* Added spanish (es), russian (ru), portuguese brazilian (ptbr), turkish (tr), and polish (pl) localization +* Added removeAttrs plugin to facilate adding and removing multiple attributes +* Added groups option to display a single message for multiple elements, via groups: { arbitraryGroupName: "fieldName1 fieldName2[, fieldNameN" } +* Enhanced rules() for adding and removing (static) rules: rules("add", "method1[, methodN]"/{method1:param[, method_n:param]}) and rules("remove"[, "method1[, method_n]") +* Enhanced rules-option, accepts space-seperated string-list of methods, eg. {birthdate: "required date"} +* Fixed checkbox group validation with inline rules: As long as the rules are specified on the first element, the group is now properly validated on click +* Fixed #2473, ignoring all rules with an explicit parameter of boolean-false, eg. required:false is the same as not specifying required at all (it was handled as required:true so far) +* Fixed #2424, with a modified patch from #2473: Methods returning a dependency-mismatch don't stop other rules from being evaluated anymore; still, success isn't applied for optional fields +* Fixed url and email validation to not use trimmed values +* Fixed creditcard validation to accept only digits and dashes ("asdf" is not a valid creditcard number) +* Allow both button and input elements for cancel buttons (via class="cancel") +* Fixed #2215: Fixed message display to call unhighlight as part of showing and hiding messages, no more visual side-effects while checking an element and extracted validator.checkForm to validate a form without UI sideeffects +* Rewrote custom selectors (:blank, :filled, :unchecked) with functions for compability with AIR + +1.2.1 +----- + +* Bundled delegeate plugin with validate plugin - its always required anyway +* Improved remote validation to include parts from the ajaxQueue plugin for proper synchronization (no additional plugin necessary) +* Fixed stopRequest to prevent pendingRequest < 0 +* Added jQuery.validator.autoCreateRanges property, defaults to false, enable to convert min/max to range and minlength/maxlength to rangelength; this basically fixes the issue introduced by automatically creating ranges in 1.2 +* Fixed optional-methods to not highlight anything at all if the field is blank, that is, don't trigger success +* Allow false/null for highlight/unhighlight options instead of forcing a do-nothing-callback even when nothing needs to be highlighted +* Fixed validate() call with no elements selected, returning undefined instead of throwing an error +* Improved demo, replacing metadata with classes/attributes for specifying rules +* Fixed error when no custom message is used for remote validation +* Modified email and url validation to require domain label and top label +* Fixed url and email validation to require TLD (actually to require domain label); 1.2 version (TLD is optional) is moved to additionals as url2 and email2 +* Fixed dynamic-totals demo in IE6/7 and improved templating, using textarea to store multiline template and string interpolation +* Added login form example with "Email password" link that makes the password field optional +* Enhanced dynamic-totals demo with an example of a single message for two fields + +1.2 +--- + +* Added AJAX-captcha validation example (based on http://psyrens.com/captcha/) +* Added remember-the-milk-demo (thanks RTM team for the permission!) +* Added marketo-demo (thanks Glen Lipka!) +* Added support for ajax-validation, see method "remote"; serverside returns JSON, true for valid elements, false or a String for invalid, String is used as message +* Added highlight and unhighlight options, by default toggles errorClass on element, allows custom highlighting +* Added valid() plugin method for easy programmatic checking of forms and fields without the need to use the validator API +* Added rules() plguin method to read and write rules for an element (currently read only) +* Replaced regex for email method, thanks to the contribution by Scott Gonzalez, see http://projects.scottsplayground.com/email_address_validation/ +* Restructured event architecture to rely solely on delegation, both improving performance, and ease-of-use for the developer (requires jquery.delegate.js) +* Moved documentation from inline to http://docs.jquery.com/Plugins/Validation - including interactive examples for all methods +* Removed validator.refresh(), validation is now completey dynamic +* Renamed minValue to min, maxValue to max and rangeValue to range, deprecating the previous names (to be removed in 1.3) +* Renamed minLength to minlength, maxLength to maxlength and rangeLength to rangelength, deprecating the previous names (to be removed in 1.3) +* Added feature to merge min + max into and range and minlength + maxlength into rangelength +* Added support for dynamic rule parameters, allowing to specify a function as a parameter eg. for minlength, called when validating the element +* Allow to specify null or an empty string as a message to display nothing (see marketo demo) +* Rules overhaul: Now supports combination of rules-option, metadata, classes (new) and attributes (new), see rules() for details + +1.1.2 +--- + +* Replaced regex for URL method, thanks to the contribution by Scott Gonzalez, see http://projects.scottsplayground.com/iri/ +* Improved email method to better handle unicode characters +* Fixed error container to hide when all elements are valid, not only on form submit +* Fixed String.format to jQuery.format (moving into jQuery namespace) +* Fixed accept method to accept both upper and lowercase extensions +* Fixed validate() plugin method to create only one validator instance for a given form and always return that one instance (avoids binding events multiple times) +* Changed debug-mode console log from "error" to "warn" level + +1.1.1 +----- + +* Fixed invalid XHTML, preventing error label creation in IE since jQuery 1.1.4 +* Fixed and improved String.format: Global search & replace, better handling of array arguments +* Fixed cancel-button handling to use validator-object for storing state instead of form element +* Fixed name selectors to handle "complex" names, eg. containing brackets ("list[]") +* Added button and disabled elements to exclude from validation +* Moved element event handlers to refresh to be able to add handlers to new elements +* Fixed email validation to allow long top level domains (eg. ".travel") +* Moved showErrors() from valid() to form() +* Added validator.size(): returns the number of current errors +* Call submitHandler with validator as scope for easier access of it's methods, eg. to find error labels using errorsFor(Element) +* Compatible with jQuery 1.1.x and 1.2.x + +1.1 +--- + +* Added validation on blur, keyup and click (for checkboxes and radiobutton). Replaces event-option. +* Fixed resetForm +* Fixed custom-methods-demo + +1.0 +--- + +* Improved number and numberDE methods to check for correct decimal numbers with delimiters +* Only elements that have rules are checked (otherwise success-option is applied to all elements) +* Added creditcard number method (thanks to Brian Klug) +* Added ignore-option, eg. ignore: "[@type=hidden]", using that expression to exclude elements to validate. Default: none, though submit and reset buttons are always ignored +* Heavily enhanced Functions-as-messages by providing a flexible String.format helper +* Accept Functions as messages, providing runtime-custom-messages +* Fixed exclusion of elements without rules from successList +* Fixed custom-method-demo, replaced the alert with message displaying the number of errors +* Fixed form-submit-prevention when using submitHandler +* Completely removed dependency on element IDs, though they are still used (when present) to link error labels to inputs. Achieved by using + an array with {name, message, element} instead of an object with id:message pairs for the internal errorList. +* Added support for specifying simple rules as simple strings, eg. "required" is equivalent to {required: true} +* Added feature: Add errorClass to invalid field�s parent element, making it easy to style the label/field container or the label for the field. +* Added feature: focusCleanup - If enabled, removes the errorClass from the invalid elements and hides all errors messages whenever the element is focused. +* Added success option to show the a field was validated successfully +* Fixed Opera select-issue (avoiding a attribute-collision) +* Fixed problems with focussing hidden elements in IE +* Added feature to skip validation for submit buttons with class "cancel" +* Fixed potential issues with Google Toolbar by prefering plugin option messages over title attribute +* submitHandler is only called when an actual submit event was handled, validator.form() returns false only for invalid forms +* Invalid elements are now focused only on submit or via validator.focusInvalid(), avoiding all trouble with focus-on-blur +* IE6 error container layout issue is solved +* Customize error element via errorElement option +* Added validator.refresh() to find new inputs in the form +* Added accept validation method, checks file extensions +* Improved dependecy feature by adding two custom expressions: ":blank" to select elements with an empty value and �:filled� to select elements with a value, both excluding whitespace +* Added a resetForm() method to the validator: Resets each form element (using the form plugin, if available), removes classes on invalid elements and hides all error messages +* Fixed docs for validator.showErrors() +* Fixed error label creation to always use html() instead of text(), allowing arbitrary HTML passed in as messages +* Fixed error label creation to use specified error class +* Added dependency feature: The requires method accepts both String (jQuery expressions) and Functions as the argument +* Heavily improved customizing of error message display: Use normal messages and show/hide an additional container; Completely replace message display with own mechanism (while being able to delegate to the default handler; Customize placing of generated labels (instead of default below-element) +* Fixed two major bugs in IE (error containers) and Opera (metadata) +* Modified validation methods to accept empty fields as valid (exception: of course �required� and also �equalTo� methods) +* Renamed "min" to "minLength", "max" to "maxLength", "length" to "rangeLength" +* Added "minValue", "maxValue" and "rangeValue" +* Streamlined API for support of different events. The default, submit, can be disabled. If any event is specified, that is applied to each element (instead of the entire form). Combining keyup-validation with submit-validation is now extremely easy to setup +* Added support for one-message-per-rule when defining messages via plugin settings +* Added support to wrap metadata in some parent element. Useful when metadata is used for other plugins, too. +* Refactored tests and demos: Less files, better demos * Improved documentation: More examples for methods, more reference texts explaining some basics \ No newline at end of file diff --git a/demo/captcha/captcha.js b/demo/captcha/captcha.js index 3debc0838..245bc45ab 100644 --- a/demo/captcha/captcha.js +++ b/demo/captcha/captcha.js @@ -1,27 +1,27 @@ -$(function(){ - $("#refreshimg").click(function(){ - $.post('newsession.php'); - $("#captchaimage").load('image_req.php'); - return false; - }); - - $("#captchaform").validate({ - rules: { - captcha: { - required: true, - remote: "process.php" - } - }, - messages: { - captcha: "Correct captcha is required. Click the captcha to generate a new one" - }, - submitHandler: function() { - alert("Correct captcha!"); - }, - success: function(label) { - label.addClass("valid").text("Valid captcha!") - }, - onkeyup: false - }); - -}); +$(function(){ + $("#refreshimg").click(function(){ + $.post('newsession.php'); + $("#captchaimage").load('image_req.php'); + return false; + }); + + $("#captchaform").validate({ + rules: { + captcha: { + required: true, + remote: "process.php" + } + }, + messages: { + captcha: "Correct captcha is required. Click the captcha to generate a new one" + }, + submitHandler: function() { + alert("Correct captcha!"); + }, + success: function(label) { + label.addClass("valid").text("Valid captcha!") + }, + onkeyup: false + }); + +}); diff --git a/demo/captcha/image_req.php b/demo/captcha/image_req.php index 6ad954a15..6a65774c6 100644 --- a/demo/captcha/image_req.php +++ b/demo/captcha/image_req.php @@ -1,6 +1,6 @@ -Captcha image'; - +Captcha image'; + ?> \ No newline at end of file diff --git a/demo/captcha/index.php b/demo/captcha/index.php index 600b54152..74bd54f50 100644 --- a/demo/captcha/index.php +++ b/demo/captcha/index.php @@ -1,66 +1,66 @@ - - - - - - AJAX CAPTCHA - - - - - - - - - - - - - - -

AJAX CAPTCHA, based on http://psyrens.com/captcha/

- -
-
-
Captcha image
- - - -
-
- -

If you can't decipher the text on the image, click it to dynamically generate a new one.

- - - + + + + + + AJAX CAPTCHA + + + + + + + + + + + + + + +

AJAX CAPTCHA, based on http://psyrens.com/captcha/

+ +
+
+
Captcha image
+ + + +
+
+ +

If you can't decipher the text on the image, click it to dynamically generate a new one.

+ + + \ No newline at end of file diff --git a/demo/captcha/newsession.php b/demo/captcha/newsession.php index 45032c0e1..36ff45e27 100644 --- a/demo/captcha/newsession.php +++ b/demo/captcha/newsession.php @@ -1,12 +1,12 @@ - \ No newline at end of file diff --git a/demo/captcha/process.php b/demo/captcha/process.php index 2fa01fcf6..24fe3a8bc 100644 --- a/demo/captcha/process.php +++ b/demo/captcha/process.php @@ -1,14 +1,14 @@ - \ No newline at end of file diff --git a/demo/captcha/rand.php b/demo/captcha/rand.php index c0ead9caa..88b595e77 100644 --- a/demo/captcha/rand.php +++ b/demo/captcha/rand.php @@ -1,11 +1,11 @@ - \ No newline at end of file diff --git a/demo/captcha/style.css b/demo/captcha/style.css index 013dcc5e4..c0bbe5f90 100644 --- a/demo/captcha/style.css +++ b/demo/captcha/style.css @@ -113,14 +113,14 @@ p#statusred { fieldset label { display: block; -} - -fieldset label.error { - color: red; -} - -fieldset label.valid { - color: green; +} + +fieldset label.error { + color: red; +} + +fieldset label.valid { + color: green; } fieldset div#captchaimage { @@ -132,8 +132,8 @@ fieldset input#captcha { width: 25%; border: 1px solid #ddd; padding: 2px; -} - +} + fieldset input#submit { display: block; margin: 2% 0% 0% 0%; diff --git a/demo/css/cmxform.css b/demo/css/cmxform.css index 4389af61b..120f5a473 100644 --- a/demo/css/cmxform.css +++ b/demo/css/cmxform.css @@ -1,46 +1,46 @@ -/********************************** - -Name: cmxform Styles - -***********************************/ -form.cmxform { - width: 370px; - font-size: 1.0em; - color: #333; -} - -form.cmxform legend { - padding-left: 0; -} - -form.cmxform legend, form.cmxform label { - color: #333; -} - -form.cmxform fieldset { - border: none; - border-top: 1px solid #C9DCA6; - background: url(../images/cmxform-fieldset.gif) left bottom repeat-x; - background-color: #F8FDEF; -} - -form.cmxform fieldset fieldset { - background: none; -} - -form.cmxform fieldset p, form.cmxform fieldset fieldset { - padding: 5px 10px 7px; - background: url(../images/cmxform-divider.gif) left bottom repeat-x; -} - +/********************************** + +Name: cmxform Styles + +***********************************/ +form.cmxform { + width: 370px; + font-size: 1.0em; + color: #333; +} + +form.cmxform legend { + padding-left: 0; +} + +form.cmxform legend, form.cmxform label { + color: #333; +} + +form.cmxform fieldset { + border: none; + border-top: 1px solid #C9DCA6; + background: url(../images/cmxform-fieldset.gif) left bottom repeat-x; + background-color: #F8FDEF; +} + +form.cmxform fieldset fieldset { + background: none; +} + +form.cmxform fieldset p, form.cmxform fieldset fieldset { + padding: 5px 10px 7px; + background: url(../images/cmxform-divider.gif) left bottom repeat-x; +} + form.cmxform label.error, label.error { - /* remove the next line when you have trouble in IE6 with labels in list */ - color: red; - font-style: italic + /* remove the next line when you have trouble in IE6 with labels in list */ + color: red; + font-style: italic } div.error { display: none; } -input { border: 1px solid black; } +input { border: 1px solid black; } input.checkbox { border: none } input:focus { border: 1px dotted black; } -input.error { border: 1px dotted red; } +input.error { border: 1px dotted red; } form.cmxform .gray * { color: gray; } \ No newline at end of file diff --git a/demo/css/cmxformTemplate.css b/demo/css/cmxformTemplate.css index 62b91bff6..ac52f71b4 100644 --- a/demo/css/cmxformTemplate.css +++ b/demo/css/cmxformTemplate.css @@ -1,55 +1,55 @@ -/********************************** - -Use: cmxform template - -***********************************/ -form.cmxform fieldset { - margin-bottom: 10px; -} - -form.cmxform legend { - padding: 0 2px; - font-weight: bold; - _margin: 0 -7px; /* IE Win */ -} - -form.cmxform label { - display: inline-block; - line-height: 1.8; - vertical-align: top; - cursor: hand; -} - -form.cmxform fieldset p { - list-style: none; - padding: 5px; - margin: 0; -} - -form.cmxform fieldset fieldset { - border: none; - margin: 3px 0 0; -} - -form.cmxform fieldset fieldset legend { - padding: 0 0 5px; - font-weight: normal; -} - -form.cmxform fieldset fieldset label { - display: block; - width: auto; -} - -form.cmxform label { width: 100px; } /* Width of labels */ -form.cmxform fieldset fieldset label { margin-left: 103px; } /* Width plus 3 (html space) */ -form.cmxform label.error { - margin-left: 103px; - width: 220px; -} - -form.cmxform input.submit { - margin-left: 103px; -} - +/********************************** + +Use: cmxform template + +***********************************/ +form.cmxform fieldset { + margin-bottom: 10px; +} + +form.cmxform legend { + padding: 0 2px; + font-weight: bold; + _margin: 0 -7px; /* IE Win */ +} + +form.cmxform label { + display: inline-block; + line-height: 1.8; + vertical-align: top; + cursor: hand; +} + +form.cmxform fieldset p { + list-style: none; + padding: 5px; + margin: 0; +} + +form.cmxform fieldset fieldset { + border: none; + margin: 3px 0 0; +} + +form.cmxform fieldset fieldset legend { + padding: 0 0 5px; + font-weight: normal; +} + +form.cmxform fieldset fieldset label { + display: block; + width: auto; +} + +form.cmxform label { width: 100px; } /* Width of labels */ +form.cmxform fieldset fieldset label { margin-left: 103px; } /* Width plus 3 (html space) */ +form.cmxform label.error { + margin-left: 103px; + width: 220px; +} + +form.cmxform input.submit { + margin-left: 103px; +} + /*\*//*/ form.cmxform legend { display: inline-block; } /* IE Mac legend fix */ \ No newline at end of file diff --git a/demo/css/core.css b/demo/css/core.css index 5aa591325..84494e873 100644 --- a/demo/css/core.css +++ b/demo/css/core.css @@ -1,16 +1,16 @@ -body, div { font-family: 'lucida grande', helvetica, verdana, arial, sans-serif } -body { margin: 0; padding: 0; font-size: small; color: #333 } -h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 } -h1 { font-size: large } -#main { padding: 1em; } -#banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc; - background: url(../images/bg.gif) repeat-x; text-align: center } -#banner a { color: white; } - -p { margin: 10px 0; } - -li { margin-left: 10px; } - +body, div { font-family: 'lucida grande', helvetica, verdana, arial, sans-serif } +body { margin: 0; padding: 0; font-size: small; color: #333 } +h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 } +h1 { font-size: large } +#main { padding: 1em; } +#banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc; + background: url(../images/bg.gif) repeat-x; text-align: center } +#banner a { color: white; } + +p { margin: 10px 0; } + +li { margin-left: 10px; } + h3 { margin: 1em 0 0; } h1 { font-size: 2em; } diff --git a/demo/css/reset.css b/demo/css/reset.css index dafae074f..5c376b374 100644 --- a/demo/css/reset.css +++ b/demo/css/reset.css @@ -1,61 +1,61 @@ -/********************************** - -Use: Reset Styles for all browsers - -***********************************/ - -body, p, blockquote { - margin: 0; - padding: 0; -} - -a img, iframe { border: none; } - -/* Headers -------------------------------*/ - -h1, h2, h3, h4, h5, h6 { - margin: 0; - padding: 0; - font-size: 100%; -} - -/* Lists -------------------------------*/ - -ul, ol, dl, li, dt, dd { - margin: 0; - padding: 0; -} - -/* Links -------------------------------*/ - -a, a:link {} -a:visited {} -a:hover {} -a:active {} - -/* Forms -------------------------------*/ - -form, fieldset { - margin: 0; - padding: 0; -} - -fieldset { border: 1px solid #000; } - -legend { - padding: 0; - color: #000; -} - -input, textarea, select { - margin: 0; - padding: 1px; - font-size: 100%; - font-family: inherit; -} - +/********************************** + +Use: Reset Styles for all browsers + +***********************************/ + +body, p, blockquote { + margin: 0; + padding: 0; +} + +a img, iframe { border: none; } + +/* Headers +------------------------------*/ + +h1, h2, h3, h4, h5, h6 { + margin: 0; + padding: 0; + font-size: 100%; +} + +/* Lists +------------------------------*/ + +ul, ol, dl, li, dt, dd { + margin: 0; + padding: 0; +} + +/* Links +------------------------------*/ + +a, a:link {} +a:visited {} +a:hover {} +a:active {} + +/* Forms +------------------------------*/ + +form, fieldset { + margin: 0; + padding: 0; +} + +fieldset { border: 1px solid #000; } + +legend { + padding: 0; + color: #000; +} + +input, textarea, select { + margin: 0; + padding: 1px; + font-size: 100%; + font-family: inherit; +} + select { padding: 0; } \ No newline at end of file diff --git a/demo/css/screen.css b/demo/css/screen.css index 26532c223..840f572bb 100644 --- a/demo/css/screen.css +++ b/demo/css/screen.css @@ -1,11 +1,11 @@ -/********************************** - -Use: Main Screen Import - -***********************************/ - -@import "reset.css"; -@import "core.css"; - -@import "cmxformTemplate.css"; +/********************************** + +Use: Main Screen Import + +***********************************/ + +@import "reset.css"; +@import "core.css"; + +@import "cmxformTemplate.css"; @import "cmxform.css"; \ No newline at end of file diff --git a/demo/custom-messages-metadata-demo.html b/demo/custom-messages-metadata-demo.html index 801e18a3d..46e3d6ec0 100644 --- a/demo/custom-messages-metadata-demo.html +++ b/demo/custom-messages-metadata-demo.html @@ -1,92 +1,92 @@ - - - - -jQuery validation plug-in - comment form example - - - - - - - - - - - - - - -

jQuery Validation Plugin Demo

-
- -

Take a look at the source to see how messages can be customized with metadata.

- - -
-
- Please enter your email address -

- - - -

-

- -

-
-
- -
-
- Please enter your email address -

- - - -

-

- -

-
-
- -
-
- Please enter your email address -

- - - -

-

- -

-
-
- -Back to main page - - - - - + + + + +jQuery validation plug-in - comment form example + + + + + + + + + + + + + + +

jQuery Validation Plugin Demo

+
+ +

Take a look at the source to see how messages can be customized with metadata.

+ + +
+
+ Please enter your email address +

+ + + +

+

+ +

+
+
+ +
+
+ Please enter your email address +

+ + + +

+

+ +

+
+
+ +
+
+ Please enter your email address +

+ + + +

+

+ +

+
+
+ +Back to main page + + + + + \ No newline at end of file diff --git a/demo/custom-methods-demo.html b/demo/custom-methods-demo.html index 7a998c3e2..1e9b62893 100644 --- a/demo/custom-methods-demo.html +++ b/demo/custom-methods-demo.html @@ -24,8 +24,8 @@ }; $().ready(function() { - var validator = $("#texttests").bind("invalid-form.validate", function() { - $("#summary").html("Your form contains " + validator.numberOfInvalids() + " errors, see details below."); + var validator = $("#texttests").bind("invalid-form.validate", function() { + $("#summary").html("Your form contains " + validator.numberOfInvalids() + " errors, see details below."); }).validate({ debug: true, errorElement: "em", diff --git a/demo/dynamic-totals.html b/demo/dynamic-totals.html index 04be6274d..5ea458267 100644 --- a/demo/dynamic-totals.html +++ b/demo/dynamic-totals.html @@ -9,40 +9,40 @@ - + - + +}); + + +} + - - -

jQuery Validation Plugin Demo

-
- - + + + + + + -
+

-
- Example with custom methods and heavily customized error display +
+ Example with custom methods and heavily customized error display @@ -124,22 +124,22 @@

- - - + + + - +
 
 
-
+
- - + +

Your form contains tons of errors! Please try again.

-

Back to main page

- -
+

Back to main page

+ +
diff --git a/demo/index.html b/demo/index.html index ee541935d..20087f77f 100644 --- a/demo/index.html +++ b/demo/index.html @@ -204,13 +204,13 @@

Syntetic examples

  • Custom methods and message display.
  • Dynamic forms
  • Forms styled with jQuery UI Themeroller
    • - -

    Real-world examples

    - +

    Real-world examples

    +

    Testsuite

    diff --git a/demo/js/chili-1.7.pack.js b/demo/js/chili-1.7.pack.js index d6ddc0ecf..90e7735cb 100644 --- a/demo/js/chili-1.7.pack.js +++ b/demo/js/chili-1.7.pack.js @@ -1 +1 @@ -eval(function(p,a,c,k,e,d){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)d[e(c)]=k[c]||e(c);k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1;};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p;}('8={3b:"1.6",2o:"1B.1Y,1B.23,1B.2e",2i:"",2H:1a,12:"",2C:1a,Z:"",2a:\'$$\',R:"&#F;",1j:"&#F;&#F;&#F;&#F;",1f:"&#F;<1W/>",3c:5(){9 $(y).39("1k")[0]},I:{},N:{}};(5($){$(5(){5 1J(l,a){5 2I(A,h){4 3=(1v h.3=="1h")?h.3:h.3.1w;k.1m({A:A,3:"("+3+")",u:1+(3.c(/\\\\./g,"%").c(/\\[.*?\\]/g,"%").3a(/\\((?!\\?)/g)||[]).u,z:(h.z)?h.z:8.2a})}5 2z(){4 1E=0;4 1x=x 2A;Q(4 i=0;i\';8.N[X]=1H;7($.31.34){4 W=J.1L(Y);4 $W=$(W);$("2d").1O($W)}v{$("2d").1O(Y)}}}5 1q(e,a){4 l=e&&e.1g&&e.1g[0]&&e.1g[0].37;7(!l)l="";l=l.c(/\\r\\n?/g,"\\n");4 C=1J(l,a);7(8.1j){C=C.c(/\\t/g,8.1j)}7(8.1f){C=C.c(/\\n/g,8.1f)}$(e).38(C)}5 1o(q,13){4 1l={12:8.12,2x:q+".1d",Z:8.Z,2w:q+".2u"};4 B;7(13&&1v 13=="2l")B=$.35(1l,13);v B=1l;9{a:B.12+B.2x,1p:B.Z+B.2w}}7($.2q)$.2q({36:"2l.15"});4 2n=x 1u("\\\\b"+8.2i+"\\\\b","2j");4 1e=[];$(8.2o).2D(5(){4 e=y;4 1n=$(e).3i("V");7(!1n){9}4 q=$.3u(1n.c(2n,""));7(\'\'!=q){1e.1m(e);4 f=1o(q,e.15);7(8.2H||e.15){7(!8.N[f.a]){1D{8.N[f.a]=1H;$.3v(f.a,5(M){M.f=f.a;8.I[f.a]=M;7(8.2C){2B(f.1p)}$("."+q).2D(5(){4 f=1o(q,y.15);7(M.f==f.a){1q(y,M)}})})}1I(3s){3t("a 3w Q: "+q+\'@\'+3z)}}}v{4 a=8.I[f.a];7(a){1q(e,a)}}}});7(J.1i&&J.1i.29){5 22(p){7(\'\'==p){9""}1z{4 16=(x 3A()).2k()}19(p.3x(16)>-1);p=p.c(/\\<1W[^>]*?\\>/3y,16);4 e=J.1L(\'<1k>\');e.3l=p;p=e.3m.c(x 1u(16,"g"),\'\\r\\n\');9 p}4 T="";4 18=1G;$(1e).3j().G("1k").U("2c",5(){18=y}).U("1M",5(){7(18==y)T=J.1i.29().3k});$("3n").U("3q",5(){7(\'\'!=T){2p.3r.3o(\'3p\',22(T));2V.2R=1a}}).U("2c",5(){T=""}).U("1M",5(){18=1G})}})})(1Z);8.I["1Y.1d"]={k:{2M:{3:/\\/\\*[^*]*\\*+(?:[^\\/][^*]*\\*+)*\\//},25:{3:/\\ - -
    - - - - -
    - - -
    - - - -
    - - - - -
    - - - - -

    Step 1 of 2

    -

    -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    -

    Login Information

    -
    - -
    - -
    - -
    -
    -
    - - -
    - -


    -
    -
    - - -
    - - - -
    -
    -
    - - - - -
    - - - - - - -
    - - - - + + + + + + + + + + +Subscription Signup | Marketo + + + + + + + + + + + + + + +
    + + + + +
    + + +
    + + + +
    + + + + +
    + + + + +

    Step 1 of 2

    +

    +

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +

    Login Information

    +
    + +
    + +
    + +
    +
    +
    + + +
    + +


    +
    +
    + + +
    + + + +
    +
    +
    + + + + +
    + + + + + + +
    + + + + diff --git a/demo/marketo/jquery.maskedinput.js b/demo/marketo/jquery.maskedinput.js index dba8c2a5a..0cd5cfcd5 100644 --- a/demo/marketo/jquery.maskedinput.js +++ b/demo/marketo/jquery.maskedinput.js @@ -1,267 +1,267 @@ -/* - * Copyright (c) 2007 Josh Bush (digitalbush.com) - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * Version: 1.1 - * Release: 2007-09-08 - */ -(function($) { - //Helper Functions for Caret positioning - function getCaretPosition(ctl){ - var res = {begin: 0, end: 0 }; - if (ctl.setSelectionRange){ - res.begin = ctl.selectionStart; - res.end = ctl.selectionEnd; - }else if (document.selection && document.selection.createRange){ - var range = document.selection.createRange(); - res.begin = 0 - range.duplicate().moveStart('character', -100000); - res.end = res.begin + range.text.length; - } - return res; - }; - - function setCaretPosition(ctl, pos){ - if(ctl.setSelectionRange){ - ctl.focus(); - ctl.setSelectionRange(pos,pos); - }else if (ctl.createTextRange){ - var range = ctl.createTextRange(); - range.collapse(true); - range.moveEnd('character', pos); - range.moveStart('character', pos); - range.select(); - } - }; - - //Predefined character definitions - var charMap={ - '9':"[0-9]", - 'a':"[A-Za-z]", - '*':"[A-Za-z0-9]" - }; - - //Helper method to inject character definitions - $.mask={ - addPlaceholder : function(c,r){ - charMap[c]=r; - } - }; - - $.fn.unmask=function(){ - return this.trigger("unmask"); - }; - - //Main Method - $.fn.mask = function(mask,settings) { - settings = $.extend({ - placeholder: "_", - completed: null - }, settings); - - //Build Regex for format validation - var reString="^"; - for(var i=0;i 16 && k < 32 ) || (k > 32 && k < 41)); - - //delete selection before proceeding - if((pos.begin-pos.end)!=0 && (!ignore || k==8 || k==46)){ - clearBuffer(pos.begin,pos.end); - } - //backspace and delete get special treatment - if(k==8){//backspace - while(pos.begin-->=0){ - if(!locked[pos.begin]){ - buffer[pos.begin]=settings.placeholder; - if($.browser.opera){ - //Opera won't let you cancel the backspace, so we'll let it backspace over a dummy character. - writeBuffer(pos.begin); - setCaretPosition(this,pos.begin+1); - }else{ - writeBuffer(); - setCaretPosition(this,pos.begin); - } - return false; - } - } - }else if(k==46){//delete - clearBuffer(pos.begin,pos.begin+1); - writeBuffer(); - setCaretPosition(this,pos.begin); - return false; - }else if (k==27){ - clearBuffer(0,mask.length); - writeBuffer(); - setCaretPosition(this,0); - return false; - } - - }; - input.bind("keydown",keydownEvent); - - function keypressEvent(e){ - if(ignore){ - ignore=false; - return; - } - e=e||window.event; - var k=e.charCode||e.keyCode||e.which; - - var pos=getCaretPosition(this); - var caretPos=pos.begin; - - if(e.ctrlKey || e.altKey){//Ignore - return true; - }else if ((k>=41 && k<=122) ||k==32 || k>186){//typeable characters - while(pos.begin=buffer.length) - settings.completed.call(input); - else - setCaretPosition(this,caretPos); - - return false; - }; - input.bind("keypress",keypressEvent); - - /*Helper Methods*/ - function clearBuffer(start,end){ - for(var i=start;i 16 && k < 32 ) || (k > 32 && k < 41)); + + //delete selection before proceeding + if((pos.begin-pos.end)!=0 && (!ignore || k==8 || k==46)){ + clearBuffer(pos.begin,pos.end); + } + //backspace and delete get special treatment + if(k==8){//backspace + while(pos.begin-->=0){ + if(!locked[pos.begin]){ + buffer[pos.begin]=settings.placeholder; + if($.browser.opera){ + //Opera won't let you cancel the backspace, so we'll let it backspace over a dummy character. + writeBuffer(pos.begin); + setCaretPosition(this,pos.begin+1); + }else{ + writeBuffer(); + setCaretPosition(this,pos.begin); + } + return false; + } + } + }else if(k==46){//delete + clearBuffer(pos.begin,pos.begin+1); + writeBuffer(); + setCaretPosition(this,pos.begin); + return false; + }else if (k==27){ + clearBuffer(0,mask.length); + writeBuffer(); + setCaretPosition(this,0); + return false; + } + + }; + input.bind("keydown",keydownEvent); + + function keypressEvent(e){ + if(ignore){ + ignore=false; + return; + } + e=e||window.event; + var k=e.charCode||e.keyCode||e.which; + + var pos=getCaretPosition(this); + var caretPos=pos.begin; + + if(e.ctrlKey || e.altKey){//Ignore + return true; + }else if ((k>=41 && k<=122) ||k==32 || k>186){//typeable characters + while(pos.begin=buffer.length) + settings.completed.call(input); + else + setCaretPosition(this,caretPos); + + return false; + }; + input.bind("keypress",keypressEvent); + + /*Helper Methods*/ + function clearBuffer(start,end){ + for(var i=start;i= 6 && /\d/.test(value) && /[a-z]/i.test(value); - if (!result) { - element.value = ""; - var validator = this; - setTimeout(function() { - validator.blockFocusCleanup = true; - element.focus(); - validator.blockFocusCleanup = false; - }, 1); - } - return result; - }, "Your password must be at least 6 characters long and contain at least one number and one character."); - - // a custom method making the default value for companyurl ("http://") invalid, without displaying the "invalid url" message - jQuery.validator.addMethod("defaultInvalid", function(value, element) { - return value != element.defaultValue; - }, ""); - - jQuery.validator.addMethod("billingRequired", function(value, element) { - if ($("#bill_to_co").is(":checked")) - return $(element).parents(".subTable").length; - return !this.optional(element); - }, ""); - - jQuery.validator.messages.required = ""; - $("form").validate({ - invalidHandler: function(e, validator) { - var errors = validator.numberOfInvalids(); - if (errors) { - var message = errors == 1 - ? 'You missed 1 field. It has been highlighted below' - : 'You missed ' + errors + ' fields. They have been highlighted below'; - $("div.error span").html(message); - $("div.error").show(); - } else { - $("div.error").hide(); - } - }, - onkeyup: false, - submitHandler: function() { - $("div.error").hide(); - alert("submit! use link below to go to the other step"); - }, - messages: { - password2: { - required: " ", - equalTo: "Please enter the same password as above" - }, - email: { - required: " ", - email: "Please enter a valid email address, example: you@yourdomain.com", - remote: jQuery.validator.format("{0} is already taken, please enter a different address.") - } - }, - debug:true - }); - - $(".resize").vjustify(); - $("div.buttonSubmit").hoverClass("buttonSubmitHover"); - - if ($.browser.safari) { - $("body").addClass("safari"); - } - - $("input.phone").mask("(999) 999-9999"); - $("input.zipcode").mask("99999"); - var creditcard = $("#creditcard").mask("9999 9999 9999 9999"); - - $("#cc_type").change( - function() { - switch ($(this).val()){ - case 'amex': - creditcard.unmask().mask("9999 999999 99999"); - break; - default: - creditcard.unmask().mask("9999 9999 9999 9999"); - break; - } - } - ); - - // toggle optional billing address - var subTableDiv = $("div.subTableDiv"); - var toggleCheck = $("input.toggleCheck"); - toggleCheck.is(":checked") - ? subTableDiv.hide() - : subTableDiv.show(); - $("input.toggleCheck").click(function() { - if (this.checked == true) { - subTableDiv.slideUp("medium"); - $("form").valid(); - } else { - subTableDiv.slideDown("medium"); - } - }); - - -}); - -$.fn.vjustify = function() { - var maxHeight=0; - $(".resize").css("height","auto"); - this.each(function(){ - if (this.offsetHeight > maxHeight) { - maxHeight = this.offsetHeight; - } - }); - this.each(function(){ - $(this).height(maxHeight); - if (this.offsetHeight > maxHeight) { - $(this).height((maxHeight-(this.offsetHeight-maxHeight))); - } - }); -}; - -$.fn.hoverClass = function(classname) { - return this.hover(function() { - $(this).addClass(classname); - }, function() { - $(this).removeClass(classname); - }); + $(document).ready(function(){ + + jQuery.validator.addMethod("password", function( value, element ) { + var result = this.optional(element) || value.length >= 6 && /\d/.test(value) && /[a-z]/i.test(value); + if (!result) { + element.value = ""; + var validator = this; + setTimeout(function() { + validator.blockFocusCleanup = true; + element.focus(); + validator.blockFocusCleanup = false; + }, 1); + } + return result; + }, "Your password must be at least 6 characters long and contain at least one number and one character."); + + // a custom method making the default value for companyurl ("http://") invalid, without displaying the "invalid url" message + jQuery.validator.addMethod("defaultInvalid", function(value, element) { + return value != element.defaultValue; + }, ""); + + jQuery.validator.addMethod("billingRequired", function(value, element) { + if ($("#bill_to_co").is(":checked")) + return $(element).parents(".subTable").length; + return !this.optional(element); + }, ""); + + jQuery.validator.messages.required = ""; + $("form").validate({ + invalidHandler: function(e, validator) { + var errors = validator.numberOfInvalids(); + if (errors) { + var message = errors == 1 + ? 'You missed 1 field. It has been highlighted below' + : 'You missed ' + errors + ' fields. They have been highlighted below'; + $("div.error span").html(message); + $("div.error").show(); + } else { + $("div.error").hide(); + } + }, + onkeyup: false, + submitHandler: function() { + $("div.error").hide(); + alert("submit! use link below to go to the other step"); + }, + messages: { + password2: { + required: " ", + equalTo: "Please enter the same password as above" + }, + email: { + required: " ", + email: "Please enter a valid email address, example: you@yourdomain.com", + remote: jQuery.validator.format("{0} is already taken, please enter a different address.") + } + }, + debug:true + }); + + $(".resize").vjustify(); + $("div.buttonSubmit").hoverClass("buttonSubmitHover"); + + if ($.browser.safari) { + $("body").addClass("safari"); + } + + $("input.phone").mask("(999) 999-9999"); + $("input.zipcode").mask("99999"); + var creditcard = $("#creditcard").mask("9999 9999 9999 9999"); + + $("#cc_type").change( + function() { + switch ($(this).val()){ + case 'amex': + creditcard.unmask().mask("9999 999999 99999"); + break; + default: + creditcard.unmask().mask("9999 9999 9999 9999"); + break; + } + } + ); + + // toggle optional billing address + var subTableDiv = $("div.subTableDiv"); + var toggleCheck = $("input.toggleCheck"); + toggleCheck.is(":checked") + ? subTableDiv.hide() + : subTableDiv.show(); + $("input.toggleCheck").click(function() { + if (this.checked == true) { + subTableDiv.slideUp("medium"); + $("form").valid(); + } else { + subTableDiv.slideDown("medium"); + } + }); + + +}); + +$.fn.vjustify = function() { + var maxHeight=0; + $(".resize").css("height","auto"); + this.each(function(){ + if (this.offsetHeight > maxHeight) { + maxHeight = this.offsetHeight; + } + }); + this.each(function(){ + $(this).height(maxHeight); + if (this.offsetHeight > maxHeight) { + $(this).height((maxHeight-(this.offsetHeight-maxHeight))); + } + }); +}; + +$.fn.hoverClass = function(classname) { + return this.hover(function() { + $(this).addClass(classname); + }, function() { + $(this).removeClass(classname); + }); }; \ No newline at end of file diff --git a/demo/marketo/step2.htm b/demo/marketo/step2.htm index 0c9f19ac4..933d68265 100644 --- a/demo/marketo/step2.htm +++ b/demo/marketo/step2.htm @@ -1,291 +1,291 @@ - - - - - - - - - - -Subscription Signup | Marketo - - - - - - - + + + + + + + + + + +Subscription Signup | Marketo + + + + + + + - - - - - - - - - - - - -
    - - - - -
    - - -
    - - - -
    - - - - -
    - - - - -

    Step 2 of 2

    -

    Billing Information

    -

    -

    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Billing Address: -
    - - - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - -
    - -
    - -
    - -
    - -
    - -
    -
    -
    Credit Card Type: - -
    Expiration: - - -
    - -
    - -
    -
    - - -

    - -
    -
    -
    - -
    - - - -
    -
    -
    - - - - -
    - - - - - - -
    - - - - - - - + + + + + + + + + + + + +
    + + + + +
    + + +
    + + + +
    + + + + +
    + + + + +

    Step 2 of 2

    +

    Billing Information

    +

    +

    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Billing Address: +
    + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    Credit Card Type: + +
    Expiration: + + +
    + +
    + +
    +
    + + +

    + +
    +
    +
    + +
    + + + +
    +
    +
    + + + + +
    + + + + + + +
    + + + + + + + diff --git a/demo/milk/emails.php b/demo/milk/emails.php index 8402b5fef..059ac14d7 100644 --- a/demo/milk/emails.php +++ b/demo/milk/emails.php @@ -1,10 +1,10 @@ - \ No newline at end of file diff --git a/demo/milk/emails.phps b/demo/milk/emails.phps index 6bf20ba35..d2219cc92 100644 --- a/demo/milk/emails.phps +++ b/demo/milk/emails.phps @@ -1,10 +1,10 @@ - \ No newline at end of file diff --git a/demo/milk/milk.css b/demo/milk/milk.css index 34f3a68ad..d5f128bf2 100644 --- a/demo/milk/milk.css +++ b/demo/milk/milk.css @@ -172,10 +172,10 @@ table.tabbedtable label { text-align: right; padding-right: 9px; } } #signupform label.error { - background:url("../images/unchecked.gif") no-repeat 0px 0px; - padding-left: 16px; - padding-bottom: 2px; - font-weight: bold; + background:url("../images/unchecked.gif") no-repeat 0px 0px; + padding-left: 16px; + padding-bottom: 2px; + font-weight: bold; color: #EA5200; } diff --git a/demo/milk/users.php b/demo/milk/users.php index 7dd239011..4fef967f1 100644 --- a/demo/milk/users.php +++ b/demo/milk/users.php @@ -1,12 +1,12 @@ - \ No newline at end of file diff --git a/demo/milk/users.phps b/demo/milk/users.phps index a43fa20d3..dfe4c8e9c 100644 --- a/demo/milk/users.phps +++ b/demo/milk/users.phps @@ -1,10 +1,10 @@ - \ No newline at end of file diff --git a/demo/multipart/index.html b/demo/multipart/index.html index f2a741183..2fc5973d6 100644 --- a/demo/multipart/index.html +++ b/demo/multipart/index.html @@ -26,25 +26,25 @@ // accordion functions var accordion = $("#stepForm").accordion(); - var current = 0; - - $.validator.addMethod("pageRequired", function(value, element) { - var $element = $(element) - function match(index) { - return current == index && $(element).parents("#sf" + (index + 1)).length; - } - if (match(0) || match(1) || match(2)) { - return !this.optional(element); - } - return "dependency-mismatch"; - }, $.validator.messages.required) + var current = 0; + + $.validator.addMethod("pageRequired", function(value, element) { + var $element = $(element) + function match(index) { + return current == index && $(element).parents("#sf" + (index + 1)).length; + } + if (match(0) || match(1) || match(2)) { + return !this.optional(element); + } + return "dependency-mismatch"; + }, $.validator.messages.required) var v = $("#cmaForm").validate({ errorClass: "warning", onkeyup: false, - onblur: false, - submitHandler: function() { - alert("Submitted, thanks!"); + onblur: false, + submitHandler: function() { + alert("Submitted, thanks!"); } }); diff --git a/demo/multipart/js/jquery.maskedinput-1.0.js b/demo/multipart/js/jquery.maskedinput-1.0.js index a9b0238fa..9ba3ecfa1 100644 --- a/demo/multipart/js/jquery.maskedinput-1.0.js +++ b/demo/multipart/js/jquery.maskedinput-1.0.js @@ -1,246 +1,246 @@ -/* - * Copyright (c) 2007 Josh Bush (digitalbush.com) - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * Version: 1.0 - * Release: 2007-07-25 - */ -(function($) { - //Helper Functions for Caret positioning - function getCaretPosition(ctl){ - var res = {begin: 0, end: 0 }; - if (ctl.setSelectionRange){ - res.begin = ctl.selectionStart; - res.end = ctl.selectionEnd; - }else if (document.selection && document.selection.createRange){ - var range = document.selection.createRange(); - res.begin = 0 - range.duplicate().moveStart('character', -100000); - res.end = res.begin + range.text.length; - } - return res; - }; - - function setCaretPosition(ctl, pos){ - if(ctl.setSelectionRange){ - ctl.focus(); - ctl.setSelectionRange(pos,pos); - }else if (ctl.createTextRange){ - var range = ctl.createTextRange(); - range.collapse(true); - range.moveEnd('character', pos); - range.moveStart('character', pos); - range.select(); - } - }; - - //Predefined character definitions - var charMap={ - '9':"[0-9]", - 'a':"[A-Za-z]", - '*':"[A-Za-z0-9]" - }; - - //Helper method to inject character definitions - $.mask={ - addPlaceholder : function(c,r){ - charMap[c]=r; - } - }; - - //Main Method - $.fn.mask = function(mask,settings) { - settings = $.extend({ - placeholder: "_", - completed: null - }, settings); - - //Build Regex for format validation - var reString="^"; - for(var i=0;i 16 && k < 32 ) || (k > 32 && k < 41)); - - //delete selection before proceeding - if((pos.begin-pos.end)!=0 && (!ignore || k==8 || k==46)){ - clearBuffer(pos.begin,pos.end); - } - //backspace and delete get special treatment - if(k==8){//backspace - while(pos.begin-->=0){ - if(!locked[pos.begin]){ - buffer[pos.begin]=settings.placeholder; - if($.browser.opera){ - //Opera won't let you cancel the backspace, so we'll let it backspace over a dummy character. - writeBuffer(pos.begin); - setCaretPosition(this,pos.begin+1); - }else{ - writeBuffer(); - setCaretPosition(this,pos.begin); - } - return false; - } - } - }else if(k==46){//delete - clearBuffer(pos.begin,pos.begin+1); - writeBuffer(); - setCaretPosition(this,pos.begin); - return false; - }else if (k==27){ - clearBuffer(0,mask.length); - writeBuffer(); - setCaretPosition(this,0); - return false; - } - - }); - - input.keypress(function(e){ - if(ignore){ - ignore=false; - return; - } - e=e||window.event; - var k=e.charCode||e.keyCode||e.which; - - var pos=getCaretPosition(this); - var caretPos=pos.begin; - - if(e.ctrlKey || e.altKey){//Ignore - return true; - }else if ((k>=41 && k<=122) ||k==32 || k>186){//typeable characters - while(pos.begin=buffer.length) - settings.completed.call(input); - else - setCaretPosition(this,caretPos); - - return false; - }); - - /*Helper Methods*/ - function clearBuffer(start,end){ - for(var i=start;i 16 && k < 32 ) || (k > 32 && k < 41)); + + //delete selection before proceeding + if((pos.begin-pos.end)!=0 && (!ignore || k==8 || k==46)){ + clearBuffer(pos.begin,pos.end); + } + //backspace and delete get special treatment + if(k==8){//backspace + while(pos.begin-->=0){ + if(!locked[pos.begin]){ + buffer[pos.begin]=settings.placeholder; + if($.browser.opera){ + //Opera won't let you cancel the backspace, so we'll let it backspace over a dummy character. + writeBuffer(pos.begin); + setCaretPosition(this,pos.begin+1); + }else{ + writeBuffer(); + setCaretPosition(this,pos.begin); + } + return false; + } + } + }else if(k==46){//delete + clearBuffer(pos.begin,pos.begin+1); + writeBuffer(); + setCaretPosition(this,pos.begin); + return false; + }else if (k==27){ + clearBuffer(0,mask.length); + writeBuffer(); + setCaretPosition(this,0); + return false; + } + + }); + + input.keypress(function(e){ + if(ignore){ + ignore=false; + return; + } + e=e||window.event; + var k=e.charCode||e.keyCode||e.which; + + var pos=getCaretPosition(this); + var caretPos=pos.begin; + + if(e.ctrlKey || e.altKey){//Ignore + return true; + }else if ((k>=41 && k<=122) ||k==32 || k>186){//typeable characters + while(pos.begin=buffer.length) + settings.completed.call(input); + else + setCaretPosition(this,caretPos); + + return false; + }); + + /*Helper Methods*/ + function clearBuffer(start,end){ + for(var i=start;i - - -jQuery Validation plugin: integration with TinyMCE - - - - - - - - - - -
    -

    TinyMCE and Validation Plugin integration example

    - - - - -
    - - - - -
    - -
    - - - + + + +jQuery Validation plugin: integration with TinyMCE + + + + + + + + + + +
    +

    TinyMCE and Validation Plugin integration example

    + + + + +
    + + + + +
    + +
    + + + diff --git a/demo/tinymce/themes/simple/langs/en.js b/demo/tinymce/themes/simple/langs/en.js index 9f08f102f..6f095311d 100644 --- a/demo/tinymce/themes/simple/langs/en.js +++ b/demo/tinymce/themes/simple/langs/en.js @@ -1,11 +1,11 @@ -tinyMCE.addI18n('en.simple',{ -bold_desc:"Bold (Ctrl+B)", -italic_desc:"Italic (Ctrl+I)", -underline_desc:"Underline (Ctrl+U)", -striketrough_desc:"Strikethrough", -bullist_desc:"Unordered list", -numlist_desc:"Ordered list", -undo_desc:"Undo (Ctrl+Z)", -redo_desc:"Redo (Ctrl+Y)", -cleanup_desc:"Cleanup messy code" +tinyMCE.addI18n('en.simple',{ +bold_desc:"Bold (Ctrl+B)", +italic_desc:"Italic (Ctrl+I)", +underline_desc:"Underline (Ctrl+U)", +striketrough_desc:"Strikethrough", +bullist_desc:"Unordered list", +numlist_desc:"Ordered list", +undo_desc:"Undo (Ctrl+Z)", +redo_desc:"Redo (Ctrl+Y)", +cleanup_desc:"Cleanup messy code" }); \ No newline at end of file diff --git a/demo/tinymce/themes/simple/skins/default/ui.css b/demo/tinymce/themes/simple/skins/default/ui.css index 076fe84e3..32feae628 100644 --- a/demo/tinymce/themes/simple/skins/default/ui.css +++ b/demo/tinymce/themes/simple/skins/default/ui.css @@ -1,32 +1,32 @@ -/* Reset */ -.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000} - -/* Containers */ -.defaultSimpleSkin {position:relative} -.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;} -.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;} -.defaultSimpleSkin .mceToolbar {height:24px;} - -/* Layout */ -.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px} -.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px} - -/* Button */ -.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px} -.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0} -.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0} -.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} - -/* Separator */ -.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px} - -/* Theme */ -.defaultSimpleSkin span.mce_bold {background-position:0 0} -.defaultSimpleSkin span.mce_italic {background-position:-60px 0} -.defaultSimpleSkin span.mce_underline {background-position:-140px 0} -.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0} -.defaultSimpleSkin span.mce_undo {background-position:-160px 0} -.defaultSimpleSkin span.mce_redo {background-position:-100px 0} -.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0} -.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0} -.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0} +/* Reset */ +.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000} + +/* Containers */ +.defaultSimpleSkin {position:relative} +.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;} +.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;} +.defaultSimpleSkin .mceToolbar {height:24px;} + +/* Layout */ +.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px} +.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px} + +/* Button */ +.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px} +.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0} +.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0} +.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} + +/* Separator */ +.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px} + +/* Theme */ +.defaultSimpleSkin span.mce_bold {background-position:0 0} +.defaultSimpleSkin span.mce_italic {background-position:-60px 0} +.defaultSimpleSkin span.mce_underline {background-position:-140px 0} +.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0} +.defaultSimpleSkin span.mce_undo {background-position:-160px 0} +.defaultSimpleSkin span.mce_redo {background-position:-100px 0} +.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0} +.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0} +.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0} diff --git a/lib/jquery-1.4.2.js b/lib/jquery-1.4.2.js index 5c4c146e5..fff677643 100644 --- a/lib/jquery-1.4.2.js +++ b/lib/jquery-1.4.2.js @@ -1,6240 +1,6240 @@ -/*! - * jQuery JavaScript Library v1.4.2 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Sat Feb 13 22:33:48 2010 -0500 - */ -(function( window, undefined ) { - -// Define a local copy of jQuery -var jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context ); - }, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // Use the correct document accordingly with window argument (sandbox) - document = window.document, - - // A central reference to the root jQuery(document) - rootjQuery, - - // A simple way to check for HTML strings or ID strings - // (both of which we optimize for) - quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, - - // Is it a simple selector - isSimple = /^.[^:#\[\.,]*$/, - - // Check if a string has a non-whitespace character in it - rnotwhite = /\S/, - - // Used for trimming whitespace - rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, - - // Keep a UserAgent string for use with jQuery.browser - userAgent = navigator.userAgent, - - // For matching the engine and version of the browser - browserMatch, - - // Has the ready events already been bound? - readyBound = false, - - // The functions to execute on DOM ready - readyList = [], - - // The ready event handler - DOMContentLoaded, - - // Save a reference to some core methods - toString = Object.prototype.toString, - hasOwnProperty = Object.prototype.hasOwnProperty, - push = Array.prototype.push, - slice = Array.prototype.slice, - indexOf = Array.prototype.indexOf; - -jQuery.fn = jQuery.prototype = { - init: function( selector, context ) { - var match, elem, ret, doc; - - // Handle $(""), $(null), or $(undefined) - if ( !selector ) { - return this; - } - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this.context = this[0] = selector; - this.length = 1; - return this; - } - - // The body element only exists once, optimize finding it - if ( selector === "body" && !context ) { - this.context = document; - this[0] = document.body; - this.selector = "body"; - this.length = 1; - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - // Are we dealing with HTML string or an ID? - match = quickExpr.exec( selector ); - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - doc = (context ? context.ownerDocument || context : document); - - // If a single string is passed in and it's a single tag - // just do a createElement and skip the rest - ret = rsingleTag.exec( selector ); - - if ( ret ) { - if ( jQuery.isPlainObject( context ) ) { - selector = [ document.createElement( ret[1] ) ]; - jQuery.fn.attr.call( selector, context, true ); - - } else { - selector = [ doc.createElement( ret[1] ) ]; - } - - } else { - ret = buildFragment( [ match[1] ], [ doc ] ); - selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; - } - - return jQuery.merge( this, selector ); - - // HANDLE: $("#id") - } else { - elem = document.getElementById( match[2] ); - - if ( elem ) { - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id !== match[2] ) { - return rootjQuery.find( selector ); - } - - // Otherwise, we inject the element directly into the jQuery object - this.length = 1; - this[0] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $("TAG") - } else if ( !context && /^\w+$/.test( selector ) ) { - this.selector = selector; - this.context = document; - selector = document.getElementsByTagName( selector ); - return jQuery.merge( this, selector ); - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return (context || rootjQuery).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return jQuery( context ).find( selector ); - } - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return rootjQuery.ready( selector ); - } - - if (selector.selector !== undefined) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }, - - // Start with an empty selector - selector: "", - - // The current version of jQuery being used - jquery: "1.4.2", - - // The default length of a jQuery object is 0 - length: 0, - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - toArray: function() { - return slice.call( this, 0 ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == null ? - - // Return a 'clean' array - this.toArray() : - - // Return just the object - ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] ); - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems, name, selector ) { - // Build a new jQuery matched element set - var ret = jQuery(); - - if ( jQuery.isArray( elems ) ) { - push.apply( ret, elems ); - - } else { - jQuery.merge( ret, elems ); - } - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - ret.context = this.context; - - if ( name === "find" ) { - ret.selector = this.selector + (this.selector ? " " : "") + selector; - } else if ( name ) { - ret.selector = this.selector + "." + name + "(" + selector + ")"; - } - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - ready: function( fn ) { - // Attach the listeners - jQuery.bindReady(); - - // If the DOM is already ready - if ( jQuery.isReady ) { - // Execute the function immediately - fn.call( document, jQuery ); - - // Otherwise, remember the function for later - } else if ( readyList ) { - // Add the function to the wait list - readyList.push( fn ); - } - - return this; - }, - - eq: function( i ) { - return i === -1 ? - this.slice( i ) : - this.slice( i, +i + 1 ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ), - "slice", slice.call(arguments).join(",") ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function( elem, i ) { - return callback.call( elem, i, elem ); - })); - }, - - end: function() { - return this.prevObject || jQuery(null); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: [].sort, - splice: [].splice -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.fn.init.prototype = jQuery.fn; - -jQuery.extend = jQuery.fn.extend = function() { - // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction(target) ) { - target = {}; - } - - // extend jQuery itself if only one argument is passed - if ( length === i ) { - target = this; - --i; - } - - for ( ; i < length; i++ ) { - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) { - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging object literal values or arrays - if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) { - var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src - : jQuery.isArray(copy) ? [] : {}; - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend({ - noConflict: function( deep ) { - window.$ = _$; - - if ( deep ) { - window.jQuery = _jQuery; - } - - return jQuery; - }, - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // Handle when the DOM is ready - ready: function() { - // Make sure that the DOM is not already loaded - if ( !jQuery.isReady ) { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( !document.body ) { - return setTimeout( jQuery.ready, 13 ); - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If there are functions bound, to execute - if ( readyList ) { - // Execute all of them - var fn, i = 0; - while ( (fn = readyList[ i++ ]) ) { - fn.call( document, jQuery ); - } - - // Reset the list of functions - readyList = null; - } - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - } - } - }, - - bindReady: function() { - if ( readyBound ) { - return; - } - - readyBound = true; - - // Catch cases where $(document).ready() is called after the - // browser event has already occurred. - if ( document.readyState === "complete" ) { - return jQuery.ready(); - } - - // Mozilla, Opera and webkit nightlies currently support this event - if ( document.addEventListener ) { - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", jQuery.ready, false ); - - // If IE event model is used - } else if ( document.attachEvent ) { - // ensure firing before onload, - // maybe late but safe also for iframes - document.attachEvent("onreadystatechange", DOMContentLoaded); - - // A fallback to window.onload, that will always work - window.attachEvent( "onload", jQuery.ready ); - - // If IE and not a frame - // continually check to see if the document is ready - var toplevel = false; - - try { - toplevel = window.frameElement == null; - } catch(e) {} - - if ( document.documentElement.doScroll && toplevel ) { - doScrollCheck(); - } - } - }, - - // See test/unit/core.js for details concerning isFunction. - // Since version 1.3, DOM methods and functions like alert - // aren't supported. They return false on IE (#2968). - isFunction: function( obj ) { - return toString.call(obj) === "[object Function]"; - }, - - isArray: function( obj ) { - return toString.call(obj) === "[object Array]"; - }, - - isPlainObject: function( obj ) { - // Must be an Object. - // Because of IE, we also have to check the presence of the constructor property. - // Make sure that DOM nodes and window objects don't pass through, as well - if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) { - return false; - } - - // Not own constructor property must be Object - if ( obj.constructor - && !hasOwnProperty.call(obj, "constructor") - && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) { - return false; - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own. - - var key; - for ( key in obj ) {} - - return key === undefined || hasOwnProperty.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - for ( var name in obj ) { - return false; - } - return true; - }, - - error: function( msg ) { - throw msg; - }, - - parseJSON: function( data ) { - if ( typeof data !== "string" || !data ) { - return null; - } - - // Make sure leading/trailing whitespace is removed (IE can't handle it) - data = jQuery.trim( data ); - - // Make sure the incoming data is actual JSON - // Logic borrowed from http://json.org/json2.js - if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@") - .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]") - .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) { - - // Try to use the native JSON parser first - return window.JSON && window.JSON.parse ? - window.JSON.parse( data ) : - (new Function("return " + data))(); - - } else { - jQuery.error( "Invalid JSON: " + data ); - } - }, - - noop: function() {}, - - // Evalulates a script in a global context - globalEval: function( data ) { - if ( data && rnotwhite.test(data) ) { - // Inspired by code by Andrea Giammarchi - // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html - var head = document.getElementsByTagName("head")[0] || document.documentElement, - script = document.createElement("script"); - - script.type = "text/javascript"; - - if ( jQuery.support.scriptEval ) { - script.appendChild( document.createTextNode( data ) ); - } else { - script.text = data; - } - - // Use insertBefore instead of appendChild to circumvent an IE6 bug. - // This arises when a base node is used (#2709). - head.insertBefore( script, head.firstChild ); - head.removeChild( script ); - } - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); - }, - - // args is for internal usage only - each: function( object, callback, args ) { - var name, i = 0, - length = object.length, - isObj = length === undefined || jQuery.isFunction(object); - - if ( args ) { - if ( isObj ) { - for ( name in object ) { - if ( callback.apply( object[ name ], args ) === false ) { - break; - } - } - } else { - for ( ; i < length; ) { - if ( callback.apply( object[ i++ ], args ) === false ) { - break; - } - } - } - - // A special, fast, case for the most common use of each - } else { - if ( isObj ) { - for ( name in object ) { - if ( callback.call( object[ name ], name, object[ name ] ) === false ) { - break; - } - } - } else { - for ( var value = object[0]; - i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {} - } - } - - return object; - }, - - trim: function( text ) { - return (text || "").replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( array, results ) { - var ret = results || []; - - if ( array != null ) { - // The window, strings (and functions) also have 'length' - // The extra typeof function check is to prevent crashes - // in Safari 2 (See: #3039) - if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) { - push.call( ret, array ); - } else { - jQuery.merge( ret, array ); - } - } - - return ret; - }, - - inArray: function( elem, array ) { - if ( array.indexOf ) { - return array.indexOf( elem ); - } - - for ( var i = 0, length = array.length; i < length; i++ ) { - if ( array[ i ] === elem ) { - return i; - } - } - - return -1; - }, - - merge: function( first, second ) { - var i = first.length, j = 0; - - if ( typeof second.length === "number" ) { - for ( var l = second.length; j < l; j++ ) { - first[ i++ ] = second[ j ]; - } - - } else { - while ( second[j] !== undefined ) { - first[ i++ ] = second[ j++ ]; - } - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, inv ) { - var ret = []; - - // Go through the array, only saving the items - // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) { - if ( !inv !== !callback( elems[ i ], i ) ) { - ret.push( elems[ i ] ); - } - } - - return ret; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var ret = [], value; - - // Go through the array, translating each of the items to their - // new value (or values). - for ( var i = 0, length = elems.length; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret[ ret.length ] = value; - } - } - - return ret.concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - proxy: function( fn, proxy, thisObject ) { - if ( arguments.length === 2 ) { - if ( typeof proxy === "string" ) { - thisObject = fn; - fn = thisObject[ proxy ]; - proxy = undefined; - - } else if ( proxy && !jQuery.isFunction( proxy ) ) { - thisObject = proxy; - proxy = undefined; - } - } - - if ( !proxy && fn ) { - proxy = function() { - return fn.apply( thisObject || this, arguments ); - }; - } - - // Set the guid of unique handler to the same of original handler, so it can be removed - if ( fn ) { - proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; - } - - // So proxy can be declared as an argument - return proxy; - }, - - // Use of jQuery.browser is frowned upon. - // More details: http://docs.jquery.com/Utilities/jQuery.browser - uaMatch: function( ua ) { - ua = ua.toLowerCase(); - - var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || - []; - - return { browser: match[1] || "", version: match[2] || "0" }; - }, - - browser: {} -}); - -browserMatch = jQuery.uaMatch( userAgent ); -if ( browserMatch.browser ) { - jQuery.browser[ browserMatch.browser ] = true; - jQuery.browser.version = browserMatch.version; -} - -// Deprecated, use jQuery.browser.webkit instead -if ( jQuery.browser.webkit ) { - jQuery.browser.safari = true; -} - -if ( indexOf ) { - jQuery.inArray = function( elem, array ) { - return indexOf.call( array, elem ); - }; -} - -// All jQuery objects should point back to these -rootjQuery = jQuery(document); - -// Cleanup functions for the document ready method -if ( document.addEventListener ) { - DOMContentLoaded = function() { - document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); - jQuery.ready(); - }; - -} else if ( document.attachEvent ) { - DOMContentLoaded = function() { - // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). - if ( document.readyState === "complete" ) { - document.detachEvent( "onreadystatechange", DOMContentLoaded ); - jQuery.ready(); - } - }; -} - -// The DOM ready check for Internet Explorer -function doScrollCheck() { - if ( jQuery.isReady ) { - return; - } - - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch( error ) { - setTimeout( doScrollCheck, 1 ); - return; - } - - // and execute any waiting functions - jQuery.ready(); -} - -function evalScript( i, elem ) { - if ( elem.src ) { - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - } else { - jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); - } - - if ( elem.parentNode ) { - elem.parentNode.removeChild( elem ); - } -} - -// Mutifunctional method to get and set values to a collection -// The value/s can be optionally by executed if its a function -function access( elems, key, value, exec, fn, pass ) { - var length = elems.length; - - // Setting many attributes - if ( typeof key === "object" ) { - for ( var k in key ) { - access( elems, k, key[k], exec, fn, value ); - } - return elems; - } - - // Setting one attribute - if ( value !== undefined ) { - // Optionally, function values get executed if exec is true - exec = !pass && exec && jQuery.isFunction(value); - - for ( var i = 0; i < length; i++ ) { - fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); - } - - return elems; - } - - // Getting an attribute - return length ? fn( elems[0], key ) : undefined; -} - -function now() { - return (new Date).getTime(); -} -(function() { - - jQuery.support = {}; - - var root = document.documentElement, - script = document.createElement("script"), - div = document.createElement("div"), - id = "script" + now(); - - div.style.display = "none"; - div.innerHTML = "
    a"; - - var all = div.getElementsByTagName("*"), - a = div.getElementsByTagName("a")[0]; - - // Can't get basic test support - if ( !all || !all.length || !a ) { - return; - } - - jQuery.support = { - // IE strips leading whitespace when .innerHTML is used - leadingWhitespace: div.firstChild.nodeType === 3, - - // Make sure that tbody elements aren't automatically inserted - // IE will insert them into empty tables - tbody: !div.getElementsByTagName("tbody").length, - - // Make sure that link elements get serialized correctly by innerHTML - // This requires a wrapper element in IE - htmlSerialize: !!div.getElementsByTagName("link").length, - - // Get the style information from getAttribute - // (IE uses .cssText insted) - style: /red/.test( a.getAttribute("style") ), - - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: a.getAttribute("href") === "/a", - - // Make sure that element opacity exists - // (IE uses filter instead) - // Use a regex to work around a WebKit issue. See #5145 - opacity: /^0.55$/.test( a.style.opacity ), - - // Verify style float existence - // (IE uses styleFloat instead of cssFloat) - cssFloat: !!a.style.cssFloat, - - // Make sure that if no value is specified for a checkbox - // that it defaults to "on". - // (WebKit defaults to "" instead) - checkOn: div.getElementsByTagName("input")[0].value === "on", - - // Make sure that a selected-by-default option has a working selected property. - // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) - optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected, - - parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null, - - // Will be defined later - deleteExpando: true, - checkClone: false, - scriptEval: false, - noCloneEvent: true, - boxModel: null - }; - - script.type = "text/javascript"; - try { - script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); - } catch(e) {} - - root.insertBefore( script, root.firstChild ); - - // Make sure that the execution of code works by injecting a script - // tag with appendChild/createTextNode - // (IE doesn't support this, fails, and uses .text instead) - if ( window[ id ] ) { - jQuery.support.scriptEval = true; - delete window[ id ]; - } - - // Test to see if it's possible to delete an expando from an element - // Fails in Internet Explorer - try { - delete script.test; - - } catch(e) { - jQuery.support.deleteExpando = false; - } - - root.removeChild( script ); - - if ( div.attachEvent && div.fireEvent ) { - div.attachEvent("onclick", function click() { - // Cloning a node shouldn't copy over any - // bound event handlers (IE does this) - jQuery.support.noCloneEvent = false; - div.detachEvent("onclick", click); - }); - div.cloneNode(true).fireEvent("onclick"); - } - - div = document.createElement("div"); - div.innerHTML = ""; - - var fragment = document.createDocumentFragment(); - fragment.appendChild( div.firstChild ); - - // WebKit doesn't clone checked state correctly in fragments - jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked; - - // Figure out if the W3C box model works as expected - // document.body must exist before we can do this - jQuery(function() { - var div = document.createElement("div"); - div.style.width = div.style.paddingLeft = "1px"; - - document.body.appendChild( div ); - jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; - document.body.removeChild( div ).style.display = 'none'; - - div = null; - }); - - // Technique from Juriy Zaytsev - // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ - var eventSupported = function( eventName ) { - var el = document.createElement("div"); - eventName = "on" + eventName; - - var isSupported = (eventName in el); - if ( !isSupported ) { - el.setAttribute(eventName, "return;"); - isSupported = typeof el[eventName] === "function"; - } - el = null; - - return isSupported; - }; - - jQuery.support.submitBubbles = eventSupported("submit"); - jQuery.support.changeBubbles = eventSupported("change"); - - // release memory in IE - root = script = div = all = a = null; -})(); - -jQuery.props = { - "for": "htmlFor", - "class": "className", - readonly: "readOnly", - maxlength: "maxLength", - cellspacing: "cellSpacing", - rowspan: "rowSpan", - colspan: "colSpan", - tabindex: "tabIndex", - usemap: "useMap", - frameborder: "frameBorder" -}; -var expando = "jQuery" + now(), uuid = 0, windowData = {}; - -jQuery.extend({ - cache: {}, - - expando:expando, - - // The following elements throw uncatchable exceptions if you - // attempt to add expando properties to them. - noData: { - "embed": true, - "object": true, - "applet": true - }, - - data: function( elem, name, data ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { - return; - } - - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache; - - if ( !id && typeof name === "string" && data === undefined ) { - return null; - } - - // Compute a unique ID for the element - if ( !id ) { - id = ++uuid; - } - - // Avoid generating a new cache unless none exists and we - // want to manipulate it. - if ( typeof name === "object" ) { - elem[ expando ] = id; - thisCache = cache[ id ] = jQuery.extend(true, {}, name); - - } else if ( !cache[ id ] ) { - elem[ expando ] = id; - cache[ id ] = {}; - } - - thisCache = cache[ id ]; - - // Prevent overriding the named cache with undefined values - if ( data !== undefined ) { - thisCache[ name ] = data; - } - - return typeof name === "string" ? thisCache[ name ] : thisCache; - }, - - removeData: function( elem, name ) { - if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { - return; - } - - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; - - // If we want to remove a specific section of the element's data - if ( name ) { - if ( thisCache ) { - // Remove the section of cache data - delete thisCache[ name ]; - - // If we've removed all the data, remove the element's cache - if ( jQuery.isEmptyObject(thisCache) ) { - jQuery.removeData( elem ); - } - } - - // Otherwise, we want to remove all of the element's data - } else { - if ( jQuery.support.deleteExpando ) { - delete elem[ jQuery.expando ]; - - } else if ( elem.removeAttribute ) { - elem.removeAttribute( jQuery.expando ); - } - - // Completely remove the data cache - delete cache[ id ]; - } - } -}); - -jQuery.fn.extend({ - data: function( key, value ) { - if ( typeof key === "undefined" && this.length ) { - return jQuery.data( this[0] ); - - } else if ( typeof key === "object" ) { - return this.each(function() { - jQuery.data( this, key ); - }); - } - - var parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value === undefined ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - if ( data === undefined && this.length ) { - data = jQuery.data( this[0], key ); - } - return data === undefined && parts[1] ? - this.data( parts[0] ) : - data; - } else { - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() { - jQuery.data( this, key, value ); - }); - } - }, - - removeData: function( key ) { - return this.each(function() { - jQuery.removeData( this, key ); - }); - } -}); -jQuery.extend({ - queue: function( elem, type, data ) { - if ( !elem ) { - return; - } - - type = (type || "fx") + "queue"; - var q = jQuery.data( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( !data ) { - return q || []; - } - - if ( !q || jQuery.isArray(data) ) { - q = jQuery.data( elem, type, jQuery.makeArray(data) ); - - } else { - q.push( data ); - } - - return q; - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), fn = queue.shift(); - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - } - - if ( fn ) { - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift("inprogress"); - } - - fn.call(elem, function() { - jQuery.dequeue(elem, type); - }); - } - } -}); - -jQuery.fn.extend({ - queue: function( type, data ) { - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - } - - if ( data === undefined ) { - return jQuery.queue( this[0], type ); - } - return this.each(function( i, elem ) { - var queue = jQuery.queue( this, type, data ); - - if ( type === "fx" && queue[0] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - }); - }, - dequeue: function( type ) { - return this.each(function() { - jQuery.dequeue( this, type ); - }); - }, - - // Based off of the plugin by Clint Helfers, with permission. - // http://blindsignals.com/index.php/2009/07/jquery-delay/ - delay: function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; - type = type || "fx"; - - return this.queue( type, function() { - var elem = this; - setTimeout(function() { - jQuery.dequeue( elem, type ); - }, time ); - }); - }, - - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - } -}); -var rclass = /[\n\t]/g, - rspace = /\s+/, - rreturn = /\r/g, - rspecialurl = /href|src|style/, - rtype = /(button|input)/i, - rfocusable = /(button|input|object|select|textarea)/i, - rclickable = /^(a|area)$/i, - rradiocheck = /radio|checkbox/; - -jQuery.fn.extend({ - attr: function( name, value ) { - return access( this, name, value, true, jQuery.attr ); - }, - - removeAttr: function( name, fn ) { - return this.each(function(){ - jQuery.attr( this, name, "" ); - if ( this.nodeType === 1 ) { - this.removeAttribute( name ); - } - }); - }, - - addClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - self.addClass( value.call(this, i, self.attr("class")) ); - }); - } - - if ( value && typeof value === "string" ) { - var classNames = (value || "").split( rspace ); - - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; - - if ( elem.nodeType === 1 ) { - if ( !elem.className ) { - elem.className = value; - - } else { - var className = " " + elem.className + " ", setClass = elem.className; - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { - setClass += " " + classNames[c]; - } - } - elem.className = jQuery.trim( setClass ); - } - } - } - } - - return this; - }, - - removeClass: function( value ) { - if ( jQuery.isFunction(value) ) { - return this.each(function(i) { - var self = jQuery(this); - self.removeClass( value.call(this, i, self.attr("class")) ); - }); - } - - if ( (value && typeof value === "string") || value === undefined ) { - var classNames = (value || "").split(rspace); - - for ( var i = 0, l = this.length; i < l; i++ ) { - var elem = this[i]; - - if ( elem.nodeType === 1 && elem.className ) { - if ( value ) { - var className = (" " + elem.className + " ").replace(rclass, " "); - for ( var c = 0, cl = classNames.length; c < cl; c++ ) { - className = className.replace(" " + classNames[c] + " ", " "); - } - elem.className = jQuery.trim( className ); - - } else { - elem.className = ""; - } - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value, isBool = typeof stateVal === "boolean"; - - if ( jQuery.isFunction( value ) ) { - return this.each(function(i) { - var self = jQuery(this); - self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); - }); - } - - return this.each(function() { - if ( type === "string" ) { - // toggle individual class names - var className, i = 0, self = jQuery(this), - state = stateVal, - classNames = value.split( rspace ); - - while ( (className = classNames[ i++ ]) ) { - // check each className given, space seperated list - state = isBool ? state : !self.hasClass( className ); - self[ state ? "addClass" : "removeClass" ]( className ); - } - - } else if ( type === "undefined" || type === "boolean" ) { - if ( this.className ) { - // store className if set - jQuery.data( this, "__className__", this.className ); - } - - // toggle whole className - this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || ""; - } - }); - }, - - hasClass: function( selector ) { - var className = " " + selector + " "; - for ( var i = 0, l = this.length; i < l; i++ ) { - if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { - return true; - } - } - - return false; - }, - - val: function( value ) { - if ( value === undefined ) { - var elem = this[0]; - - if ( elem ) { - if ( jQuery.nodeName( elem, "option" ) ) { - return (elem.attributes.value || {}).specified ? elem.value : elem.text; - } - - // We need to handle select boxes special - if ( jQuery.nodeName( elem, "select" ) ) { - var index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type === "select-one"; - - // Nothing was selected - if ( index < 0 ) { - return null; - } - - // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; - - if ( option.selected ) { - // Get the specifc value for the option - value = jQuery(option).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - } - - // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified - if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) { - return elem.getAttribute("value") === null ? "on" : elem.value; - } - - - // Everything else, we just grab the value - return (elem.value || "").replace(rreturn, ""); - - } - - return undefined; - } - - var isFunction = jQuery.isFunction(value); - - return this.each(function(i) { - var self = jQuery(this), val = value; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( isFunction ) { - val = value.call(this, i, self.val()); - } - - // Typecast each time if the value is a Function and the appended - // value is therefore different each time. - if ( typeof val === "number" ) { - val += ""; - } - - if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) { - this.checked = jQuery.inArray( self.val(), val ) >= 0; - - } else if ( jQuery.nodeName( this, "select" ) ) { - var values = jQuery.makeArray(val); - - jQuery( "option", this ).each(function() { - this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; - }); - - if ( !values.length ) { - this.selectedIndex = -1; - } - - } else { - this.value = val; - } - }); - } -}); - -jQuery.extend({ - attrFn: { - val: true, - css: true, - html: true, - text: true, - data: true, - width: true, - height: true, - offset: true - }, - - attr: function( elem, name, value, pass ) { - // don't set attributes on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; - } - - if ( pass && name in jQuery.attrFn ) { - return jQuery(elem)[name](value); - } - - var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ), - // Whether we are setting (or getting) - set = value !== undefined; - - // Try to normalize/fix the name - name = notxml && jQuery.props[ name ] || name; - - // Only do all the following if this is a node (faster for style) - if ( elem.nodeType === 1 ) { - // These attributes require special treatment - var special = rspecialurl.test( name ); - - // Safari mis-reports the default selected property of an option - // Accessing the parent's selectedIndex property fixes it - if ( name === "selected" && !jQuery.support.optSelected ) { - var parent = elem.parentNode; - if ( parent ) { - parent.selectedIndex; - - // Make sure that it also works with optgroups, see #5701 - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - } - - // If applicable, access the attribute via the DOM 0 way - if ( name in elem && notxml && !special ) { - if ( set ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { - jQuery.error( "type property can't be changed" ); - } - - elem[ name ] = value; - } - - // browsers index elements by id/name on forms, give priority to attributes. - if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { - return elem.getAttributeNode( name ).nodeValue; - } - - // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set - // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - if ( name === "tabIndex" ) { - var attributeNode = elem.getAttributeNode( "tabIndex" ); - - return attributeNode && attributeNode.specified ? - attributeNode.value : - rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? - 0 : - undefined; - } - - return elem[ name ]; - } - - if ( !jQuery.support.style && notxml && name === "style" ) { - if ( set ) { - elem.style.cssText = "" + value; - } - - return elem.style.cssText; - } - - if ( set ) { - // convert the value to a string (all browsers do this but IE) see #1070 - elem.setAttribute( name, "" + value ); - } - - var attr = !jQuery.support.hrefNormalized && notxml && special ? - // Some attributes require a special call on IE - elem.getAttribute( name, 2 ) : - elem.getAttribute( name ); - - // Non-existent attributes return null, we normalize to undefined - return attr === null ? undefined : attr; - } - - // elem is actually elem.style ... set the style - // Using attr for specific style information is now deprecated. Use style instead. - return jQuery.style( elem, name, value ); - } -}); -var rnamespaces = /\.(.*)$/, - fcleanup = function( nm ) { - return nm.replace(/[^\w\s\.\|`]/g, function( ch ) { - return "\\" + ch; - }); - }; - -/* - * A number of helper functions used for managing events. - * Many of the ideas behind this code originated from - * Dean Edwards' addEvent library. - */ -jQuery.event = { - - // Bind an event to an element - // Original by Dean Edwards - add: function( elem, types, handler, data ) { - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // For whatever reason, IE has trouble passing the window object - // around, causing it to be cloned in the process - if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) { - elem = window; - } - - var handleObjIn, handleObj; - - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - } - - // Make sure that the function being executed has a unique ID - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure - var elemData = jQuery.data( elem ); - - // If no elemData is found then we must be trying to bind to one of the - // banned noData elements - if ( !elemData ) { - return; - } - - var events = elemData.events = elemData.events || {}, - eventHandle = elemData.handle, eventHandle; - - if ( !eventHandle ) { - elemData.handle = eventHandle = function() { - // Handle the second event of a trigger and when - // an event is called after a page has unloaded - return typeof jQuery !== "undefined" && !jQuery.event.triggered ? - jQuery.event.handle.apply( eventHandle.elem, arguments ) : - undefined; - }; - } - - // Add elem as a property of the handle function - // This is to prevent a memory leak with non-native events in IE. - eventHandle.elem = elem; - - // Handle multiple events separated by a space - // jQuery(...).bind("mouseover mouseout", fn); - types = types.split(" "); - - var type, i = 0, namespaces; - - while ( (type = types[ i++ ]) ) { - handleObj = handleObjIn ? - jQuery.extend({}, handleObjIn) : - { handler: handler, data: data }; - - // Namespaced event handlers - if ( type.indexOf(".") > -1 ) { - namespaces = type.split("."); - type = namespaces.shift(); - handleObj.namespace = namespaces.slice(0).sort().join("."); - - } else { - namespaces = []; - handleObj.namespace = ""; - } - - handleObj.type = type; - handleObj.guid = handler.guid; - - // Get the current list of functions bound to this event - var handlers = events[ type ], - special = jQuery.event.special[ type ] || {}; - - // Init the event handler queue - if ( !handlers ) { - handlers = events[ type ] = []; - - // Check for a special event handler - // Only use addEventListener/attachEvent if the special - // events handler returns false - if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - // Bind the global event handler to the element - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle, false ); - - } else if ( elem.attachEvent ) { - elem.attachEvent( "on" + type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add the function to the element's handler list - handlers.push( handleObj ); - - // Keep track of which events have been used, for global triggering - jQuery.event.global[ type ] = true; - } - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - global: {}, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, pos ) { - // don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, - elemData = jQuery.data( elem ), - events = elemData && elemData.events; - - if ( !elemData || !events ) { - return; - } - - // types is actually an event object here - if ( types && types.type ) { - handler = types.handler; - types = types.type; - } - - // Unbind all events for the element - if ( !types || typeof types === "string" && types.charAt(0) === "." ) { - types = types || ""; - - for ( type in events ) { - jQuery.event.remove( elem, type + types ); - } - - return; - } - - // Handle multiple events separated by a space - // jQuery(...).unbind("mouseover mouseout", fn); - types = types.split(" "); - - while ( (type = types[ i++ ]) ) { - origType = type; - handleObj = null; - all = type.indexOf(".") < 0; - namespaces = []; - - if ( !all ) { - // Namespaced event handlers - namespaces = type.split("."); - type = namespaces.shift(); - - namespace = new RegExp("(^|\\.)" + - jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)") - } - - eventType = events[ type ]; - - if ( !eventType ) { - continue; - } - - if ( !handler ) { - for ( var j = 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( all || namespace.test( handleObj.namespace ) ) { - jQuery.event.remove( elem, origType, handleObj.handler, j ); - eventType.splice( j--, 1 ); - } - } - - continue; - } - - special = jQuery.event.special[ type ] || {}; - - for ( var j = pos || 0; j < eventType.length; j++ ) { - handleObj = eventType[ j ]; - - if ( handler.guid === handleObj.guid ) { - // remove the given handler for the given type - if ( all || namespace.test( handleObj.namespace ) ) { - if ( pos == null ) { - eventType.splice( j--, 1 ); - } - - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - - if ( pos != null ) { - break; - } - } - } - - // remove generic event handler if no more handlers exist - if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { - if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { - removeEvent( elem, type, elemData.handle ); - } - - ret = null; - delete events[ type ]; - } - } - - // Remove the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - var handle = elemData.handle; - if ( handle ) { - handle.elem = null; - } - - delete elemData.events; - delete elemData.handle; - - if ( jQuery.isEmptyObject( elemData ) ) { - jQuery.removeData( elem ); - } - } - }, - - // bubbling is internal - trigger: function( event, data, elem /*, bubbling */ ) { - // Event object or event type - var type = event.type || event, - bubbling = arguments[3]; - - if ( !bubbling ) { - event = typeof event === "object" ? - // jQuery.Event object - event[expando] ? event : - // Object literal - jQuery.extend( jQuery.Event(type), event ) : - // Just the event type (string) - jQuery.Event(type); - - if ( type.indexOf("!") >= 0 ) { - event.type = type = type.slice(0, -1); - event.exclusive = true; - } - - // Handle a global trigger - if ( !elem ) { - // Don't bubble custom events when global (to avoid too much overhead) - event.stopPropagation(); - - // Only trigger if we've ever bound an event for it - if ( jQuery.event.global[ type ] ) { - jQuery.each( jQuery.cache, function() { - if ( this.events && this.events[type] ) { - jQuery.event.trigger( event, data, this.handle.elem ); - } - }); - } - } - - // Handle triggering a single element - - // don't do events on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { - return undefined; - } - - // Clean up in case it is reused - event.result = undefined; - event.target = elem; - - // Clone the incoming data, if any - data = jQuery.makeArray( data ); - data.unshift( event ); - } - - event.currentTarget = elem; - - // Trigger the event, it is assumed that "handle" is a function - var handle = jQuery.data( elem, "handle" ); - if ( handle ) { - handle.apply( elem, data ); - } - - var parent = elem.parentNode || elem.ownerDocument; - - // Trigger an inline bound script - try { - if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) { - if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) { - event.result = false; - } - } - - // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} - - if ( !event.isPropagationStopped() && parent ) { - jQuery.event.trigger( event, data, parent, true ); - - } else if ( !event.isDefaultPrevented() ) { - var target = event.target, old, - isClick = jQuery.nodeName(target, "a") && type === "click", - special = jQuery.event.special[ type ] || {}; - - if ( (!special._default || special._default.call( elem, event ) === false) && - !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { - - try { - if ( target[ type ] ) { - // Make sure that we don't accidentally re-trigger the onFOO events - old = target[ "on" + type ]; - - if ( old ) { - target[ "on" + type ] = null; - } - - jQuery.event.triggered = true; - target[ type ](); - } - - // prevent IE from throwing an error for some elements with some event types, see #3533 - } catch (e) {} - - if ( old ) { - target[ "on" + type ] = old; - } - - jQuery.event.triggered = false; - } - } - }, - - handle: function( event ) { - var all, handlers, namespaces, namespace, events; - - event = arguments[0] = jQuery.event.fix( event || window.event ); - event.currentTarget = this; - - // Namespaced event handlers - all = event.type.indexOf(".") < 0 && !event.exclusive; - - if ( !all ) { - namespaces = event.type.split("."); - event.type = namespaces.shift(); - namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"); - } - - var events = jQuery.data(this, "events"), handlers = events[ event.type ]; - - if ( events && handlers ) { - // Clone the handlers to prevent manipulation - handlers = handlers.slice(0); - - for ( var j = 0, l = handlers.length; j < l; j++ ) { - var handleObj = handlers[ j ]; - - // Filter the functions by class - if ( all || namespace.test( handleObj.namespace ) ) { - // Pass in a reference to the handler function itself - // So that we can later remove it - event.handler = handleObj.handler; - event.data = handleObj.data; - event.handleObj = handleObj; - - var ret = handleObj.handler.apply( this, arguments ); - - if ( ret !== undefined ) { - event.result = ret; - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - - if ( event.isImmediatePropagationStopped() ) { - break; - } - } - } - } - - return event.result; - }, - - props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), - - fix: function( event ) { - if ( event[ expando ] ) { - return event; - } - - // store a copy of the original event object - // and "clone" to set read-only properties - var originalEvent = event; - event = jQuery.Event( originalEvent ); - - for ( var i = this.props.length, prop; i; ) { - prop = this.props[ --i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Fix target property, if necessary - if ( !event.target ) { - event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either - } - - // check if target is a textnode (safari) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && event.fromElement ) { - event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; - } - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && event.clientX != null ) { - var doc = document.documentElement, body = document.body; - event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); - event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); - } - - // Add which for key events - if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) { - event.which = event.charCode || event.keyCode; - } - - // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) - if ( !event.metaKey && event.ctrlKey ) { - event.metaKey = event.ctrlKey; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && event.button !== undefined ) { - event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); - } - - return event; - }, - - // Deprecated, use jQuery.guid instead - guid: 1E8, - - // Deprecated, use jQuery.proxy instead - proxy: jQuery.proxy, - - special: { - ready: { - // Make sure the ready event is setup - setup: jQuery.bindReady, - teardown: jQuery.noop - }, - - live: { - add: function( handleObj ) { - jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); - }, - - remove: function( handleObj ) { - var remove = true, - type = handleObj.origType.replace(rnamespaces, ""); - - jQuery.each( jQuery.data(this, "events").live || [], function() { - if ( type === this.origType.replace(rnamespaces, "") ) { - remove = false; - return false; - } - }); - - if ( remove ) { - jQuery.event.remove( this, handleObj.origType, liveHandler ); - } - } - - }, - - beforeunload: { - setup: function( data, namespaces, eventHandle ) { - // We only want to do this special case on windows - if ( this.setInterval ) { - this.onbeforeunload = eventHandle; - } - - return false; - }, - teardown: function( namespaces, eventHandle ) { - if ( this.onbeforeunload === eventHandle ) { - this.onbeforeunload = null; - } - } - } - } -}; - -var removeEvent = document.removeEventListener ? - function( elem, type, handle ) { - elem.removeEventListener( type, handle, false ); - } : - function( elem, type, handle ) { - elem.detachEvent( "on" + type, handle ); - }; - -jQuery.Event = function( src ) { - // Allow instantiation without the 'new' keyword - if ( !this.preventDefault ) { - return new jQuery.Event( src ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - // Event type - } else { - this.type = src; - } - - // timeStamp is buggy for some events on Firefox(#3843) - // So we won't rely on the native value - this.timeStamp = now(); - - // Mark it as fixed - this[ expando ] = true; -}; - -function returnFalse() { - return false; -} -function returnTrue() { - return true; -} - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - preventDefault: function() { - this.isDefaultPrevented = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - - // if preventDefault exists run it on the original event - if ( e.preventDefault ) { - e.preventDefault(); - } - // otherwise set the returnValue property of the original event to false (IE) - e.returnValue = false; - }, - stopPropagation: function() { - this.isPropagationStopped = returnTrue; - - var e = this.originalEvent; - if ( !e ) { - return; - } - // if stopPropagation exists run it on the original event - if ( e.stopPropagation ) { - e.stopPropagation(); - } - // otherwise set the cancelBubble property of the original event to true (IE) - e.cancelBubble = true; - }, - stopImmediatePropagation: function() { - this.isImmediatePropagationStopped = returnTrue; - this.stopPropagation(); - }, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse -}; - -// Checks if an event happened on an element within another element -// Used in jQuery.event.special.mouseenter and mouseleave handlers -var withinElement = function( event ) { - // Check if mouse(over|out) are still within the same parent element - var parent = event.relatedTarget; - - // Firefox sometimes assigns relatedTarget a XUL element - // which we cannot access the parentNode property of - try { - // Traverse up the tree - while ( parent && parent !== this ) { - parent = parent.parentNode; - } - - if ( parent !== this ) { - // set the correct event type - event.type = event.data; - - // handle event if we actually just moused on to a non sub-element - jQuery.event.handle.apply( this, arguments ); - } - - // assuming we've left the element since we most likely mousedover a xul element - } catch(e) { } -}, - -// In case of event delegation, we only need to rename the event.type, -// liveHandler will take care of the rest. -delegate = function( event ) { - event.type = event.data; - jQuery.event.handle.apply( this, arguments ); -}; - -// Create mouseenter and mouseleave events -jQuery.each({ - mouseenter: "mouseover", - mouseleave: "mouseout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - setup: function( data ) { - jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); - }, - teardown: function( data ) { - jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); - } - }; -}); - -// submit delegation -if ( !jQuery.support.submitBubbles ) { - - jQuery.event.special.submit = { - setup: function( data, namespaces ) { - if ( this.nodeName.toLowerCase() !== "form" ) { - jQuery.event.add(this, "click.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; - - if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { - return trigger( "submit", this, arguments ); - } - }); - - jQuery.event.add(this, "keypress.specialSubmit", function( e ) { - var elem = e.target, type = elem.type; - - if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { - return trigger( "submit", this, arguments ); - } - }); - - } else { - return false; - } - }, - - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialSubmit" ); - } - }; - -} - -// change delegation, happens here so we have bind. -if ( !jQuery.support.changeBubbles ) { - - var formElems = /textarea|input|select/i, - - changeFilters, - - getVal = function( elem ) { - var type = elem.type, val = elem.value; - - if ( type === "radio" || type === "checkbox" ) { - val = elem.checked; - - } else if ( type === "select-multiple" ) { - val = elem.selectedIndex > -1 ? - jQuery.map( elem.options, function( elem ) { - return elem.selected; - }).join("-") : - ""; - - } else if ( elem.nodeName.toLowerCase() === "select" ) { - val = elem.selectedIndex; - } - - return val; - }, - - testChange = function testChange( e ) { - var elem = e.target, data, val; - - if ( !formElems.test( elem.nodeName ) || elem.readOnly ) { - return; - } - - data = jQuery.data( elem, "_change_data" ); - val = getVal(elem); - - // the current data will be also retrieved by beforeactivate - if ( e.type !== "focusout" || elem.type !== "radio" ) { - jQuery.data( elem, "_change_data", val ); - } - - if ( data === undefined || val === data ) { - return; - } - - if ( data != null || val ) { - e.type = "change"; - return jQuery.event.trigger( e, arguments[1], elem ); - } - }; - - jQuery.event.special.change = { - filters: { - focusout: testChange, - - click: function( e ) { - var elem = e.target, type = elem.type; - - if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) { - return testChange.call( this, e ); - } - }, - - // Change has to be called before submit - // Keydown will be called before keypress, which is used in submit-event delegation - keydown: function( e ) { - var elem = e.target, type = elem.type; - - if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") || - (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || - type === "select-multiple" ) { - return testChange.call( this, e ); - } - }, - - // Beforeactivate happens also before the previous element is blurred - // with this event you can't trigger a change event, but you can store - // information/focus[in] is not needed anymore - beforeactivate: function( e ) { - var elem = e.target; - jQuery.data( elem, "_change_data", getVal(elem) ); - } - }, - - setup: function( data, namespaces ) { - if ( this.type === "file" ) { - return false; - } - - for ( var type in changeFilters ) { - jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); - } - - return formElems.test( this.nodeName ); - }, - - teardown: function( namespaces ) { - jQuery.event.remove( this, ".specialChange" ); - - return formElems.test( this.nodeName ); - } - }; - - changeFilters = jQuery.event.special.change.filters; -} - -function trigger( type, elem, args ) { - args[0].type = type; - return jQuery.event.handle.apply( elem, args ); -} - -// Create "bubbling" focus and blur events -if ( document.addEventListener ) { - jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { - jQuery.event.special[ fix ] = { - setup: function() { - this.addEventListener( orig, handler, true ); - }, - teardown: function() { - this.removeEventListener( orig, handler, true ); - } - }; - - function handler( e ) { - e = jQuery.event.fix( e ); - e.type = fix; - return jQuery.event.handle.call( this, e ); - } - }); -} - -jQuery.each(["bind", "one"], function( i, name ) { - jQuery.fn[ name ] = function( type, data, fn ) { - // Handle object literals - if ( typeof type === "object" ) { - for ( var key in type ) { - this[ name ](key, data, type[key], fn); - } - return this; - } - - if ( jQuery.isFunction( data ) ) { - fn = data; - data = undefined; - } - - var handler = name === "one" ? jQuery.proxy( fn, function( event ) { - jQuery( this ).unbind( event, handler ); - return fn.apply( this, arguments ); - }) : fn; - - if ( type === "unload" && name !== "one" ) { - this.one( type, data, fn ); - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.add( this[i], type, handler, data ); - } - } - - return this; - }; -}); - -jQuery.fn.extend({ - unbind: function( type, fn ) { - // Handle object literals - if ( typeof type === "object" && !type.preventDefault ) { - for ( var key in type ) { - this.unbind(key, type[key]); - } - - } else { - for ( var i = 0, l = this.length; i < l; i++ ) { - jQuery.event.remove( this[i], type, fn ); - } - } - - return this; - }, - - delegate: function( selector, types, data, fn ) { - return this.live( types, data, fn, selector ); - }, - - undelegate: function( selector, types, fn ) { - if ( arguments.length === 0 ) { - return this.unbind( "live" ); - - } else { - return this.die( types, null, fn, selector ); - } - }, - - trigger: function( type, data ) { - return this.each(function() { - jQuery.event.trigger( type, data, this ); - }); - }, - - triggerHandler: function( type, data ) { - if ( this[0] ) { - var event = jQuery.Event( type ); - event.preventDefault(); - event.stopPropagation(); - jQuery.event.trigger( event, data, this[0] ); - return event.result; - } - }, - - toggle: function( fn ) { - // Save reference to arguments for access in closure - var args = arguments, i = 1; - - // link all the functions, so any of them can unbind this click handler - while ( i < args.length ) { - jQuery.proxy( fn, args[ i++ ] ); - } - - return this.click( jQuery.proxy( fn, function( event ) { - // Figure out which function to execute - var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i; - jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 ); - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[ lastToggle ].apply( this, arguments ) || false; - })); - }, - - hover: function( fnOver, fnOut ) { - return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); - } -}); - -var liveMap = { - focus: "focusin", - blur: "focusout", - mouseenter: "mouseover", - mouseleave: "mouseout" -}; - -jQuery.each(["live", "die"], function( i, name ) { - jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { - var type, i = 0, match, namespaces, preType, - selector = origSelector || this.selector, - context = origSelector ? this : jQuery( this.context ); - - if ( jQuery.isFunction( data ) ) { - fn = data; - data = undefined; - } - - types = (types || "").split(" "); - - while ( (type = types[ i++ ]) != null ) { - match = rnamespaces.exec( type ); - namespaces = ""; - - if ( match ) { - namespaces = match[0]; - type = type.replace( rnamespaces, "" ); - } - - if ( type === "hover" ) { - types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); - continue; - } - - preType = type; - - if ( type === "focus" || type === "blur" ) { - types.push( liveMap[ type ] + namespaces ); - type = type + namespaces; - - } else { - type = (liveMap[ type ] || type) + namespaces; - } - - if ( name === "live" ) { - // bind live handler - context.each(function(){ - jQuery.event.add( this, liveConvert( type, selector ), - { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); - }); - - } else { - // unbind live handler - context.unbind( liveConvert( type, selector ), fn ); - } - } - - return this; - } -}); - -function liveHandler( event ) { - var stop, elems = [], selectors = [], args = arguments, - related, match, handleObj, elem, j, i, l, data, - events = jQuery.data( this, "events" ); - - // Make sure we avoid non-left-click bubbling in Firefox (#3861) - if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { - return; - } - - event.liveFired = this; - - var live = events.live.slice(0); - - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { - selectors.push( handleObj.selector ); - - } else { - live.splice( j--, 1 ); - } - } - - match = jQuery( event.target ).closest( selectors, event.currentTarget ); - - for ( i = 0, l = match.length; i < l; i++ ) { - for ( j = 0; j < live.length; j++ ) { - handleObj = live[j]; - - if ( match[i].selector === handleObj.selector ) { - elem = match[i].elem; - related = null; - - // Those two events require additional checking - if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { - related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; - } - - if ( !related || related !== elem ) { - elems.push({ elem: elem, handleObj: handleObj }); - } - } - } - } - - for ( i = 0, l = elems.length; i < l; i++ ) { - match = elems[i]; - event.currentTarget = match.elem; - event.data = match.handleObj.data; - event.handleObj = match.handleObj; - - if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) { - stop = false; - break; - } - } - - return stop; -} - -function liveConvert( type, selector ) { - return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&"); -} - -jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + - "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + - "change select submit keydown keypress keyup error").split(" "), function( i, name ) { - - // Handle event binding - jQuery.fn[ name ] = function( fn ) { - return fn ? this.bind( name, fn ) : this.trigger( name ); - }; - - if ( jQuery.attrFn ) { - jQuery.attrFn[ name ] = true; - } -}); - -// Prevent memory leaks in IE -// Window isn't included so as not to unbind existing unload events -// More info: -// - http://isaacschlueter.com/2006/10/msie-memory-leaks/ -if ( window.attachEvent && !window.addEventListener ) { - window.attachEvent("onunload", function() { - for ( var id in jQuery.cache ) { - if ( jQuery.cache[ id ].handle ) { - // Try/Catch is to handle iframes being unloaded, see #4280 - try { - jQuery.event.remove( jQuery.cache[ id ].handle.elem ); - } catch(e) {} - } - } - }); -} -/*! - * Sizzle CSS Selector Engine - v1.0 - * Copyright 2009, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * More information: http://sizzlejs.com/ - */ -(function(){ - -var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, - done = 0, - toString = Object.prototype.toString, - hasDuplicate = false, - baseHasDuplicate = true; - -// Here we check if the JavaScript engine is using some sort of -// optimization where it does not always call our comparision -// function. If that is the case, discard the hasDuplicate value. -// Thus far that includes Google Chrome. -[0, 0].sort(function(){ - baseHasDuplicate = false; - return 0; -}); - -var Sizzle = function(selector, context, results, seed) { - results = results || []; - var origContext = context = context || document; - - if ( context.nodeType !== 1 && context.nodeType !== 9 ) { - return []; - } - - if ( !selector || typeof selector !== "string" ) { - return results; - } - - var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context), - soFar = selector; - - // Reset the position of the chunker regexp (start from head) - while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) { - soFar = m[3]; - - parts.push( m[1] ); - - if ( m[2] ) { - extra = m[3]; - break; - } - } - - if ( parts.length > 1 && origPOS.exec( selector ) ) { - if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { - set = posProcess( parts[0] + parts[1], context ); - } else { - set = Expr.relative[ parts[0] ] ? - [ context ] : - Sizzle( parts.shift(), context ); - - while ( parts.length ) { - selector = parts.shift(); - - if ( Expr.relative[ selector ] ) { - selector += parts.shift(); - } - - set = posProcess( selector, set ); - } - } - } else { - // Take a shortcut and set the context if the root selector is an ID - // (but not if it'll be faster if the inner selector is an ID) - if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && - Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { - var ret = Sizzle.find( parts.shift(), context, contextXML ); - context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0]; - } - - if ( context ) { - var ret = seed ? - { expr: parts.pop(), set: makeArray(seed) } : - Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); - set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; - - if ( parts.length > 0 ) { - checkSet = makeArray(set); - } else { - prune = false; - } - - while ( parts.length ) { - var cur = parts.pop(), pop = cur; - - if ( !Expr.relative[ cur ] ) { - cur = ""; - } else { - pop = parts.pop(); - } - - if ( pop == null ) { - pop = context; - } - - Expr.relative[ cur ]( checkSet, pop, contextXML ); - } - } else { - checkSet = parts = []; - } - } - - if ( !checkSet ) { - checkSet = set; - } - - if ( !checkSet ) { - Sizzle.error( cur || selector ); - } - - if ( toString.call(checkSet) === "[object Array]" ) { - if ( !prune ) { - results.push.apply( results, checkSet ); - } else if ( context && context.nodeType === 1 ) { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { - results.push( set[i] ); - } - } - } else { - for ( var i = 0; checkSet[i] != null; i++ ) { - if ( checkSet[i] && checkSet[i].nodeType === 1 ) { - results.push( set[i] ); - } - } - } - } else { - makeArray( checkSet, results ); - } - - if ( extra ) { - Sizzle( extra, origContext, results, seed ); - Sizzle.uniqueSort( results ); - } - - return results; -}; - -Sizzle.uniqueSort = function(results){ - if ( sortOrder ) { - hasDuplicate = baseHasDuplicate; - results.sort(sortOrder); - - if ( hasDuplicate ) { - for ( var i = 1; i < results.length; i++ ) { - if ( results[i] === results[i-1] ) { - results.splice(i--, 1); - } - } - } - } - - return results; -}; - -Sizzle.matches = function(expr, set){ - return Sizzle(expr, null, null, set); -}; - -Sizzle.find = function(expr, context, isXML){ - var set, match; - - if ( !expr ) { - return []; - } - - for ( var i = 0, l = Expr.order.length; i < l; i++ ) { - var type = Expr.order[i], match; - - if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { - var left = match[1]; - match.splice(1,1); - - if ( left.substr( left.length - 1 ) !== "\\" ) { - match[1] = (match[1] || "").replace(/\\/g, ""); - set = Expr.find[ type ]( match, context, isXML ); - if ( set != null ) { - expr = expr.replace( Expr.match[ type ], "" ); - break; - } - } - } - } - - if ( !set ) { - set = context.getElementsByTagName("*"); - } - - return {set: set, expr: expr}; -}; - -Sizzle.filter = function(expr, set, inplace, not){ - var old = expr, result = [], curLoop = set, match, anyFound, - isXMLFilter = set && set[0] && isXML(set[0]); - - while ( expr && set.length ) { - for ( var type in Expr.filter ) { - if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { - var filter = Expr.filter[ type ], found, item, left = match[1]; - anyFound = false; - - match.splice(1,1); - - if ( left.substr( left.length - 1 ) === "\\" ) { - continue; - } - - if ( curLoop === result ) { - result = []; - } - - if ( Expr.preFilter[ type ] ) { - match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); - - if ( !match ) { - anyFound = found = true; - } else if ( match === true ) { - continue; - } - } - - if ( match ) { - for ( var i = 0; (item = curLoop[i]) != null; i++ ) { - if ( item ) { - found = filter( item, match, i, curLoop ); - var pass = not ^ !!found; - - if ( inplace && found != null ) { - if ( pass ) { - anyFound = true; - } else { - curLoop[i] = false; - } - } else if ( pass ) { - result.push( item ); - anyFound = true; - } - } - } - } - - if ( found !== undefined ) { - if ( !inplace ) { - curLoop = result; - } - - expr = expr.replace( Expr.match[ type ], "" ); - - if ( !anyFound ) { - return []; - } - - break; - } - } - } - - // Improper expression - if ( expr === old ) { - if ( anyFound == null ) { - Sizzle.error( expr ); - } else { - break; - } - } - - old = expr; - } - - return curLoop; -}; - -Sizzle.error = function( msg ) { - throw "Syntax error, unrecognized expression: " + msg; -}; - -var Expr = Sizzle.selectors = { - order: [ "ID", "NAME", "TAG" ], - match: { - ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, - NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, - ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, - TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, - CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/, - POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/, - PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ - }, - leftMatch: {}, - attrMap: { - "class": "className", - "for": "htmlFor" - }, - attrHandle: { - href: function(elem){ - return elem.getAttribute("href"); - } - }, - relative: { - "+": function(checkSet, part){ - var isPartStr = typeof part === "string", - isTag = isPartStr && !/\W/.test(part), - isPartStrNotTag = isPartStr && !isTag; - - if ( isTag ) { - part = part.toLowerCase(); - } - - for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { - if ( (elem = checkSet[i]) ) { - while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} - - checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? - elem || false : - elem === part; - } - } - - if ( isPartStrNotTag ) { - Sizzle.filter( part, checkSet, true ); - } - }, - ">": function(checkSet, part){ - var isPartStr = typeof part === "string"; - - if ( isPartStr && !/\W/.test(part) ) { - part = part.toLowerCase(); - - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - var parent = elem.parentNode; - checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; - } - } - } else { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - checkSet[i] = isPartStr ? - elem.parentNode : - elem.parentNode === part; - } - } - - if ( isPartStr ) { - Sizzle.filter( part, checkSet, true ); - } - } - }, - "": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); - checkFn = dirNodeCheck; - } - - checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); - }, - "~": function(checkSet, part, isXML){ - var doneName = done++, checkFn = dirCheck; - - if ( typeof part === "string" && !/\W/.test(part) ) { - var nodeCheck = part = part.toLowerCase(); - checkFn = dirNodeCheck; - } - - checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); - } - }, - find: { - ID: function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? [m] : []; - } - }, - NAME: function(match, context){ - if ( typeof context.getElementsByName !== "undefined" ) { - var ret = [], results = context.getElementsByName(match[1]); - - for ( var i = 0, l = results.length; i < l; i++ ) { - if ( results[i].getAttribute("name") === match[1] ) { - ret.push( results[i] ); - } - } - - return ret.length === 0 ? null : ret; - } - }, - TAG: function(match, context){ - return context.getElementsByTagName(match[1]); - } - }, - preFilter: { - CLASS: function(match, curLoop, inplace, result, not, isXML){ - match = " " + match[1].replace(/\\/g, "") + " "; - - if ( isXML ) { - return match; - } - - for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { - if ( elem ) { - if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) { - if ( !inplace ) { - result.push( elem ); - } - } else if ( inplace ) { - curLoop[i] = false; - } - } - } - - return false; - }, - ID: function(match){ - return match[1].replace(/\\/g, ""); - }, - TAG: function(match, curLoop){ - return match[1].toLowerCase(); - }, - CHILD: function(match){ - if ( match[1] === "nth" ) { - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( - match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || - !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); - - // calculate the numbers (first)n+(last) including if they are negative - match[2] = (test[1] + (test[2] || 1)) - 0; - match[3] = test[3] - 0; - } - - // TODO: Move to normal caching system - match[0] = done++; - - return match; - }, - ATTR: function(match, curLoop, inplace, result, not, isXML){ - var name = match[1].replace(/\\/g, ""); - - if ( !isXML && Expr.attrMap[name] ) { - match[1] = Expr.attrMap[name]; - } - - if ( match[2] === "~=" ) { - match[4] = " " + match[4] + " "; - } - - return match; - }, - PSEUDO: function(match, curLoop, inplace, result, not){ - if ( match[1] === "not" ) { - // If we're dealing with a complex expression, or a simple one - if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { - match[3] = Sizzle(match[3], null, null, curLoop); - } else { - var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); - if ( !inplace ) { - result.push.apply( result, ret ); - } - return false; - } - } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { - return true; - } - - return match; - }, - POS: function(match){ - match.unshift( true ); - return match; - } - }, - filters: { - enabled: function(elem){ - return elem.disabled === false && elem.type !== "hidden"; - }, - disabled: function(elem){ - return elem.disabled === true; - }, - checked: function(elem){ - return elem.checked === true; - }, - selected: function(elem){ - // Accessing this property makes selected-by-default - // options in Safari work properly - elem.parentNode.selectedIndex; - return elem.selected === true; - }, - parent: function(elem){ - return !!elem.firstChild; - }, - empty: function(elem){ - return !elem.firstChild; - }, - has: function(elem, i, match){ - return !!Sizzle( match[3], elem ).length; - }, - header: function(elem){ - return /h\d/i.test( elem.nodeName ); - }, - text: function(elem){ - return "text" === elem.type; - }, - radio: function(elem){ - return "radio" === elem.type; - }, - checkbox: function(elem){ - return "checkbox" === elem.type; - }, - file: function(elem){ - return "file" === elem.type; - }, - password: function(elem){ - return "password" === elem.type; - }, - submit: function(elem){ - return "submit" === elem.type; - }, - image: function(elem){ - return "image" === elem.type; - }, - reset: function(elem){ - return "reset" === elem.type; - }, - button: function(elem){ - return "button" === elem.type || elem.nodeName.toLowerCase() === "button"; - }, - input: function(elem){ - return /input|select|textarea|button/i.test(elem.nodeName); - } - }, - setFilters: { - first: function(elem, i){ - return i === 0; - }, - last: function(elem, i, match, array){ - return i === array.length - 1; - }, - even: function(elem, i){ - return i % 2 === 0; - }, - odd: function(elem, i){ - return i % 2 === 1; - }, - lt: function(elem, i, match){ - return i < match[3] - 0; - }, - gt: function(elem, i, match){ - return i > match[3] - 0; - }, - nth: function(elem, i, match){ - return match[3] - 0 === i; - }, - eq: function(elem, i, match){ - return match[3] - 0 === i; - } - }, - filter: { - PSEUDO: function(elem, match, i, array){ - var name = match[1], filter = Expr.filters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } else if ( name === "contains" ) { - return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; - } else if ( name === "not" ) { - var not = match[3]; - - for ( var i = 0, l = not.length; i < l; i++ ) { - if ( not[i] === elem ) { - return false; - } - } - - return true; - } else { - Sizzle.error( "Syntax error, unrecognized expression: " + name ); - } - }, - CHILD: function(elem, match){ - var type = match[1], node = elem; - switch (type) { - case 'only': - case 'first': - while ( (node = node.previousSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - if ( type === "first" ) { - return true; - } - node = elem; - case 'last': - while ( (node = node.nextSibling) ) { - if ( node.nodeType === 1 ) { - return false; - } - } - return true; - case 'nth': - var first = match[2], last = match[3]; - - if ( first === 1 && last === 0 ) { - return true; - } - - var doneName = match[0], - parent = elem.parentNode; - - if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { - var count = 0; - for ( node = parent.firstChild; node; node = node.nextSibling ) { - if ( node.nodeType === 1 ) { - node.nodeIndex = ++count; - } - } - parent.sizcache = doneName; - } - - var diff = elem.nodeIndex - last; - if ( first === 0 ) { - return diff === 0; - } else { - return ( diff % first === 0 && diff / first >= 0 ); - } - } - }, - ID: function(elem, match){ - return elem.nodeType === 1 && elem.getAttribute("id") === match; - }, - TAG: function(elem, match){ - return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; - }, - CLASS: function(elem, match){ - return (" " + (elem.className || elem.getAttribute("class")) + " ") - .indexOf( match ) > -1; - }, - ATTR: function(elem, match){ - var name = match[1], - result = Expr.attrHandle[ name ] ? - Expr.attrHandle[ name ]( elem ) : - elem[ name ] != null ? - elem[ name ] : - elem.getAttribute( name ), - value = result + "", - type = match[2], - check = match[4]; - - return result == null ? - type === "!=" : - type === "=" ? - value === check : - type === "*=" ? - value.indexOf(check) >= 0 : - type === "~=" ? - (" " + value + " ").indexOf(check) >= 0 : - !check ? - value && result !== false : - type === "!=" ? - value !== check : - type === "^=" ? - value.indexOf(check) === 0 : - type === "$=" ? - value.substr(value.length - check.length) === check : - type === "|=" ? - value === check || value.substr(0, check.length + 1) === check + "-" : - false; - }, - POS: function(elem, match, i, array){ - var name = match[2], filter = Expr.setFilters[ name ]; - - if ( filter ) { - return filter( elem, i, match, array ); - } - } - } -}; - -var origPOS = Expr.match.POS; - -for ( var type in Expr.match ) { - Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source ); - Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){ - return "\\" + (num - 0 + 1); - })); -} - -var makeArray = function(array, results) { - array = Array.prototype.slice.call( array, 0 ); - - if ( results ) { - results.push.apply( results, array ); - return results; - } - - return array; -}; - -// Perform a simple check to determine if the browser is capable of -// converting a NodeList to an array using builtin methods. -// Also verifies that the returned array holds DOM nodes -// (which is not the case in the Blackberry browser) -try { - Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; - -// Provide a fallback method if it does not work -} catch(e){ - makeArray = function(array, results) { - var ret = results || []; - - if ( toString.call(array) === "[object Array]" ) { - Array.prototype.push.apply( ret, array ); - } else { - if ( typeof array.length === "number" ) { - for ( var i = 0, l = array.length; i < l; i++ ) { - ret.push( array[i] ); - } - } else { - for ( var i = 0; array[i]; i++ ) { - ret.push( array[i] ); - } - } - } - - return ret; - }; -} - -var sortOrder; - -if ( document.documentElement.compareDocumentPosition ) { - sortOrder = function( a, b ) { - if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.compareDocumentPosition ? -1 : 1; - } - - var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( "sourceIndex" in document.documentElement ) { - sortOrder = function( a, b ) { - if ( !a.sourceIndex || !b.sourceIndex ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.sourceIndex ? -1 : 1; - } - - var ret = a.sourceIndex - b.sourceIndex; - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} else if ( document.createRange ) { - sortOrder = function( a, b ) { - if ( !a.ownerDocument || !b.ownerDocument ) { - if ( a == b ) { - hasDuplicate = true; - } - return a.ownerDocument ? -1 : 1; - } - - var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); - aRange.setStart(a, 0); - aRange.setEnd(a, 0); - bRange.setStart(b, 0); - bRange.setEnd(b, 0); - var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); - if ( ret === 0 ) { - hasDuplicate = true; - } - return ret; - }; -} - -// Utility function for retreiving the text value of an array of DOM nodes -function getText( elems ) { - var ret = "", elem; - - for ( var i = 0; elems[i]; i++ ) { - elem = elems[i]; - - // Get the text from text nodes and CDATA nodes - if ( elem.nodeType === 3 || elem.nodeType === 4 ) { - ret += elem.nodeValue; - - // Traverse everything else, except comment nodes - } else if ( elem.nodeType !== 8 ) { - ret += getText( elem.childNodes ); - } - } - - return ret; -} - -// Check to see if the browser returns elements by name when -// querying by getElementById (and provide a workaround) -(function(){ - // We're going to inject a fake input element with a specified name - var form = document.createElement("div"), - id = "script" + (new Date).getTime(); - form.innerHTML = ""; - - // Inject it into the root element, check its status, and remove it quickly - var root = document.documentElement; - root.insertBefore( form, root.firstChild ); - - // The workaround has to do additional checks after a getElementById - // Which slows things down for other browsers (hence the branching) - if ( document.getElementById( id ) ) { - Expr.find.ID = function(match, context, isXML){ - if ( typeof context.getElementById !== "undefined" && !isXML ) { - var m = context.getElementById(match[1]); - return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; - } - }; - - Expr.filter.ID = function(elem, match){ - var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); - return elem.nodeType === 1 && node && node.nodeValue === match; - }; - } - - root.removeChild( form ); - root = form = null; // release memory in IE -})(); - -(function(){ - // Check to see if the browser returns only elements - // when doing getElementsByTagName("*") - - // Create a fake element - var div = document.createElement("div"); - div.appendChild( document.createComment("") ); - - // Make sure no comments are found - if ( div.getElementsByTagName("*").length > 0 ) { - Expr.find.TAG = function(match, context){ - var results = context.getElementsByTagName(match[1]); - - // Filter out possible comments - if ( match[1] === "*" ) { - var tmp = []; - - for ( var i = 0; results[i]; i++ ) { - if ( results[i].nodeType === 1 ) { - tmp.push( results[i] ); - } - } - - results = tmp; - } - - return results; - }; - } - - // Check to see if an attribute returns normalized href attributes - div.innerHTML = ""; - if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && - div.firstChild.getAttribute("href") !== "#" ) { - Expr.attrHandle.href = function(elem){ - return elem.getAttribute("href", 2); - }; - } - - div = null; // release memory in IE -})(); - -if ( document.querySelectorAll ) { - (function(){ - var oldSizzle = Sizzle, div = document.createElement("div"); - div.innerHTML = "

    "; - - // Safari can't handle uppercase or unicode characters when - // in quirks mode. - if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { - return; - } - - Sizzle = function(query, context, extra, seed){ - context = context || document; - - // Only use querySelectorAll on non-XML documents - // (ID selectors don't work in non-HTML documents) - if ( !seed && context.nodeType === 9 && !isXML(context) ) { - try { - return makeArray( context.querySelectorAll(query), extra ); - } catch(e){} - } - - return oldSizzle(query, context, extra, seed); - }; - - for ( var prop in oldSizzle ) { - Sizzle[ prop ] = oldSizzle[ prop ]; - } - - div = null; // release memory in IE - })(); -} - -(function(){ - var div = document.createElement("div"); - - div.innerHTML = "
    "; - - // Opera can't find a second classname (in 9.6) - // Also, make sure that getElementsByClassName actually exists - if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { - return; - } - - // Safari caches class attributes, doesn't catch changes (in 3.2) - div.lastChild.className = "e"; - - if ( div.getElementsByClassName("e").length === 1 ) { - return; - } - - Expr.order.splice(1, 0, "CLASS"); - Expr.find.CLASS = function(match, context, isXML) { - if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { - return context.getElementsByClassName(match[1]); - } - }; - - div = null; // release memory in IE -})(); - -function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 && !isXML ){ - elem.sizcache = doneName; - elem.sizset = i; - } - - if ( elem.nodeName.toLowerCase() === cur ) { - match = elem; - break; - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { - for ( var i = 0, l = checkSet.length; i < l; i++ ) { - var elem = checkSet[i]; - if ( elem ) { - elem = elem[dir]; - var match = false; - - while ( elem ) { - if ( elem.sizcache === doneName ) { - match = checkSet[elem.sizset]; - break; - } - - if ( elem.nodeType === 1 ) { - if ( !isXML ) { - elem.sizcache = doneName; - elem.sizset = i; - } - if ( typeof cur !== "string" ) { - if ( elem === cur ) { - match = true; - break; - } - - } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { - match = elem; - break; - } - } - - elem = elem[dir]; - } - - checkSet[i] = match; - } - } -} - -var contains = document.compareDocumentPosition ? function(a, b){ - return !!(a.compareDocumentPosition(b) & 16); -} : function(a, b){ - return a !== b && (a.contains ? a.contains(b) : true); -}; - -var isXML = function(elem){ - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -var posProcess = function(selector, context){ - var tmpSet = [], later = "", match, - root = context.nodeType ? [context] : context; - - // Position selectors must be done after the filter - // And so must :not(positional) so we move all PSEUDOs to the end - while ( (match = Expr.match.PSEUDO.exec( selector )) ) { - later += match[0]; - selector = selector.replace( Expr.match.PSEUDO, "" ); - } - - selector = Expr.relative[selector] ? selector + "*" : selector; - - for ( var i = 0, l = root.length; i < l; i++ ) { - Sizzle( selector, root[i], tmpSet ); - } - - return Sizzle.filter( later, tmpSet ); -}; - -// EXPOSE -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[":"] = jQuery.expr.filters; -jQuery.unique = Sizzle.uniqueSort; -jQuery.text = getText; -jQuery.isXMLDoc = isXML; -jQuery.contains = contains; - -return; - -window.Sizzle = Sizzle; - -})(); -var runtil = /Until$/, - rparentsprev = /^(?:parents|prevUntil|prevAll)/, - // Note: This RegExp should be improved, or likely pulled from Sizzle - rmultiselector = /,/, - slice = Array.prototype.slice; - -// Implement the identical functionality for filter and not -var winnow = function( elements, qualifier, keep ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep(elements, function( elem, i ) { - return !!qualifier.call( elem, i, elem ) === keep; - }); - - } else if ( qualifier.nodeType ) { - return jQuery.grep(elements, function( elem, i ) { - return (elem === qualifier) === keep; - }); - - } else if ( typeof qualifier === "string" ) { - var filtered = jQuery.grep(elements, function( elem ) { - return elem.nodeType === 1; - }); - - if ( isSimple.test( qualifier ) ) { - return jQuery.filter(qualifier, filtered, !keep); - } else { - qualifier = jQuery.filter( qualifier, filtered ); - } - } - - return jQuery.grep(elements, function( elem, i ) { - return (jQuery.inArray( elem, qualifier ) >= 0) === keep; - }); -}; - -jQuery.fn.extend({ - find: function( selector ) { - var ret = this.pushStack( "", "find", selector ), length = 0; - - for ( var i = 0, l = this.length; i < l; i++ ) { - length = ret.length; - jQuery.find( selector, this[i], ret ); - - if ( i > 0 ) { - // Make sure that the results are unique - for ( var n = length; n < ret.length; n++ ) { - for ( var r = 0; r < length; r++ ) { - if ( ret[r] === ret[n] ) { - ret.splice(n--, 1); - break; - } - } - } - } - } - - return ret; - }, - - has: function( target ) { - var targets = jQuery( target ); - return this.filter(function() { - for ( var i = 0, l = targets.length; i < l; i++ ) { - if ( jQuery.contains( this, targets[i] ) ) { - return true; - } - } - }); - }, - - not: function( selector ) { - return this.pushStack( winnow(this, selector, false), "not", selector); - }, - - filter: function( selector ) { - return this.pushStack( winnow(this, selector, true), "filter", selector ); - }, - - is: function( selector ) { - return !!selector && jQuery.filter( selector, this ).length > 0; - }, - - closest: function( selectors, context ) { - if ( jQuery.isArray( selectors ) ) { - var ret = [], cur = this[0], match, matches = {}, selector; - - if ( cur && selectors.length ) { - for ( var i = 0, l = selectors.length; i < l; i++ ) { - selector = selectors[i]; - - if ( !matches[selector] ) { - matches[selector] = jQuery.expr.match.POS.test( selector ) ? - jQuery( selector, context || this.context ) : - selector; - } - } - - while ( cur && cur.ownerDocument && cur !== context ) { - for ( selector in matches ) { - match = matches[selector]; - - if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { - ret.push({ selector: selector, elem: cur }); - delete matches[selector]; - } - } - cur = cur.parentNode; - } - } - - return ret; - } - - var pos = jQuery.expr.match.POS.test( selectors ) ? - jQuery( selectors, context || this.context ) : null; - - return this.map(function( i, cur ) { - while ( cur && cur.ownerDocument && cur !== context ) { - if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) { - return cur; - } - cur = cur.parentNode; - } - return null; - }); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - if ( !elem || typeof elem === "string" ) { - return jQuery.inArray( this[0], - // If it receives a string, the selector is used - // If it receives nothing, the siblings are used - elem ? jQuery( elem ) : this.parent().children() ); - } - // Locate the position of the desired element - return jQuery.inArray( - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[0] : elem, this ); - }, - - add: function( selector, context ) { - var set = typeof selector === "string" ? - jQuery( selector, context || this.context ) : - jQuery.makeArray( selector ), - all = jQuery.merge( this.get(), set ); - - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); - }, - - andSelf: function() { - return this.add( this.prevObject ); - } -}); - -// A painfully simple check to see if an element is disconnected -// from a document (should be improved, where feasible). -function isDisconnected( node ) { - return !node || !node.parentNode || node.parentNode.nodeType === 11; -} - -jQuery.each({ - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return jQuery.dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return jQuery.dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return jQuery.nth( elem, 2, "nextSibling" ); - }, - prev: function( elem ) { - return jQuery.nth( elem, 2, "previousSibling" ); - }, - nextAll: function( elem ) { - return jQuery.dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return jQuery.dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return jQuery.dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return jQuery.dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return jQuery.sibling( elem.parentNode.firstChild, elem ); - }, - children: function( elem ) { - return jQuery.sibling( elem.firstChild ); - }, - contents: function( elem ) { - return jQuery.nodeName( elem, "iframe" ) ? - elem.contentDocument || elem.contentWindow.document : - jQuery.makeArray( elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var ret = jQuery.map( this, fn, until ); - - if ( !runtil.test( name ) ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - ret = jQuery.filter( selector, ret ); - } - - ret = this.length > 1 ? jQuery.unique( ret ) : ret; - - if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { - ret = ret.reverse(); - } - - return this.pushStack( ret, name, slice.call(arguments).join(",") ); - }; -}); - -jQuery.extend({ - filter: function( expr, elems, not ) { - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return jQuery.find.matches(expr, elems); - }, - - dir: function( elem, dir, until ) { - var matched = [], cur = elem[dir]; - while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { - if ( cur.nodeType === 1 ) { - matched.push( cur ); - } - cur = cur[dir]; - } - return matched; - }, - - nth: function( cur, result, dir, elem ) { - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType === 1 && ++num === result ) { - break; - } - } - - return cur; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - r.push( n ); - } - } - - return r; - } -}); -var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, - rleadingWhitespace = /^\s+/, - rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g, - rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i, - rtagName = /<([\w:]+)/, - rtbody = /"; - }, - wrapMap = { - option: [ 1, "" ], - legend: [ 1, "
    ", "
    " ], - thead: [ 1, "", "
    " ], - tr: [ 2, "", "
    " ], - td: [ 3, "", "
    " ], - col: [ 2, "", "
    " ], - area: [ 1, "", "" ], - _default: [ 0, "", "" ] - }; - -wrapMap.optgroup = wrapMap.option; -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// IE can't serialize and This is a p

    - * @before $.metadata.setType("elem", "script") - * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" - * @desc Reads metadata from a nested script element - * - * @param String type The encoding type - * @param String name The name of the attribute to be used to get metadata (optional) - * @cat Plugins/Metadata - * @descr Sets the type of encoding to be used when loading metadata for the first time - * @type undefined - * @see metadata() - */ - -(function($) { - -$.extend({ - metadata : { - defaults : { - type: 'class', - name: 'metadata', - cre: /({.*})/, - single: 'metadata' - }, - setType: function( type, name ){ - this.defaults.type = type; - this.defaults.name = name; - }, - get: function( elem, opts ){ - var settings = $.extend({},this.defaults,opts); - // check for empty string in single property - if ( !settings.single.length ) settings.single = 'metadata'; - - var data = $.data(elem, settings.single); - // returned cached data if it already exists - if ( data ) return data; - - data = "{}"; - - if ( settings.type == "class" ) { - var m = settings.cre.exec( elem.className ); - if ( m ) - data = m[1]; - } else if ( settings.type == "elem" ) { - if( !elem.getElementsByTagName ) - return undefined; - var e = elem.getElementsByTagName(settings.name); - if ( e.length ) - data = $.trim(e[0].innerHTML); - } else if ( elem.getAttribute != undefined ) { - var attr = elem.getAttribute( settings.name ); - if ( attr ) - data = attr; - } - - if ( data.indexOf( '{' ) <0 ) - data = "{" + data + "}"; - - data = eval("(" + data + ")"); - - $.data( elem, settings.single, data ); - return data; - } - } -}); - -/** - * Returns the metadata object for the first member of the jQuery object. - * - * @name metadata - * @descr Returns element's metadata object - * @param Object opts An object contianing settings to override the defaults - * @type jQuery - * @cat Plugins/Metadata - */ -$.fn.metadata = function( opts ){ - return $.metadata.get( this[0], opts ); -}; - +/* + * Metadata - jQuery plugin for parsing metadata from elements + * + * Copyright (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan + * + * Dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + * + * Revision: $Id: jquery.metadata.js 4187 2007-12-16 17:15:27Z joern.zaefferer $ + * + */ + +/** + * Sets the type of metadata to use. Metadata is encoded in JSON, and each property + * in the JSON will become a property of the element itself. + * + * There are three supported types of metadata storage: + * + * attr: Inside an attribute. The name parameter indicates *which* attribute. + * + * class: Inside the class attribute, wrapped in curly braces: { } + * + * elem: Inside a child element (e.g. a script tag). The + * name parameter indicates *which* element. + * + * The metadata for an element is loaded the first time the element is accessed via jQuery. + * + * As a result, you can define the metadata type, use $(expr) to load the metadata into the elements + * matched by expr, then redefine the metadata type and run another $(expr) for other elements. + * + * @name $.metadata.setType + * + * @example

    This is a p

    + * @before $.metadata.setType("class") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from the class attribute + * + * @example

    This is a p

    + * @before $.metadata.setType("attr", "data") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a "data" attribute + * + * @example

    This is a p

    + * @before $.metadata.setType("elem", "script") + * @after $("#one").metadata().item_id == 1; $("#one").metadata().item_label == "Label" + * @desc Reads metadata from a nested script element + * + * @param String type The encoding type + * @param String name The name of the attribute to be used to get metadata (optional) + * @cat Plugins/Metadata + * @descr Sets the type of encoding to be used when loading metadata for the first time + * @type undefined + * @see metadata() + */ + +(function($) { + +$.extend({ + metadata : { + defaults : { + type: 'class', + name: 'metadata', + cre: /({.*})/, + single: 'metadata' + }, + setType: function( type, name ){ + this.defaults.type = type; + this.defaults.name = name; + }, + get: function( elem, opts ){ + var settings = $.extend({},this.defaults,opts); + // check for empty string in single property + if ( !settings.single.length ) settings.single = 'metadata'; + + var data = $.data(elem, settings.single); + // returned cached data if it already exists + if ( data ) return data; + + data = "{}"; + + if ( settings.type == "class" ) { + var m = settings.cre.exec( elem.className ); + if ( m ) + data = m[1]; + } else if ( settings.type == "elem" ) { + if( !elem.getElementsByTagName ) + return undefined; + var e = elem.getElementsByTagName(settings.name); + if ( e.length ) + data = $.trim(e[0].innerHTML); + } else if ( elem.getAttribute != undefined ) { + var attr = elem.getAttribute( settings.name ); + if ( attr ) + data = attr; + } + + if ( data.indexOf( '{' ) <0 ) + data = "{" + data + "}"; + + data = eval("(" + data + ")"); + + $.data( elem, settings.single, data ); + return data; + } + } +}); + +/** + * Returns the metadata object for the first member of the jQuery object. + * + * @name metadata + * @descr Returns element's metadata object + * @param Object opts An object contianing settings to override the defaults + * @type jQuery + * @cat Plugins/Metadata + */ +$.fn.metadata = function( opts ){ + return $.metadata.get( this[0], opts ); +}; + })(jQuery); \ No newline at end of file diff --git a/localization/messages_bg.js b/localization/messages_bg.js index 69e6def02..9232f7202 100644 --- a/localization/messages_bg.js +++ b/localization/messages_bg.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: BG - */ -jQuery.extend(jQuery.validator.messages, { - required: "Полето е задължително.", - remote: "Моля, въведете правилната стойност.", - email: "Моля, въведете валиден email.", - url: "Моля, въведете валидно URL.", - date: "Моля, въведете валидна дата.", - dateISO: "Моля, въведете валидна дата (ISO).", - number: "Моля, въведете валиден номер.", - digits: "Моля, въведете само цифри", - creditcard: "Моля, въведете валиден номер на кредитна карта.", - equalTo: "Моля, въведете същата стойност отново.", - accept: "Моля, въведете стойност с валидно разширение.", - maxlength: $.validator.format("Моля, въведете повече от {0} символа."), - minlength: $.validator.format("Моля, въведете поне {0} символа."), - rangelength: $.validator.format("Моля, въведете стойност с дължина между {0} и {1} символа."), - range: $.validator.format("Моля, въведете стойност между {0} и {1}."), - max: $.validator.format("Моля, въведете стойност по-малка или равна на {0}."), - min: $.validator.format("Моля, въведете стойност по-голяма или равна на {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: BG + */ +jQuery.extend(jQuery.validator.messages, { + required: "Полето е задължително.", + remote: "Моля, въведете правилната стойност.", + email: "Моля, въведете валиден email.", + url: "Моля, въведете валидно URL.", + date: "Моля, въведете валидна дата.", + dateISO: "Моля, въведете валидна дата (ISO).", + number: "Моля, въведете валиден номер.", + digits: "Моля, въведете само цифри", + creditcard: "Моля, въведете валиден номер на кредитна карта.", + equalTo: "Моля, въведете същата стойност отново.", + accept: "Моля, въведете стойност с валидно разширение.", + maxlength: $.validator.format("Моля, въведете повече от {0} символа."), + minlength: $.validator.format("Моля, въведете поне {0} символа."), + rangelength: $.validator.format("Моля, въведете стойност с дължина между {0} и {1} символа."), + range: $.validator.format("Моля, въведете стойност между {0} и {1}."), + max: $.validator.format("Моля, въведете стойност по-малка или равна на {0}."), + min: $.validator.format("Моля, въведете стойност по-голяма или равна на {0}.") }); \ No newline at end of file diff --git a/localization/messages_cn.js b/localization/messages_cn.js index 4c12e34c2..8415f4ad7 100644 --- a/localization/messages_cn.js +++ b/localization/messages_cn.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: CN - */ -jQuery.extend(jQuery.validator.messages, { - required: "必选字段", - remote: "请修正该字段", - email: "请输入正确格式的电子邮件", - url: "请输入合法的网址", - date: "请输入合法的日期", - dateISO: "请输入合法的日期 (ISO).", - number: "请输入合法的数字", - digits: "只能输入整数", - creditcard: "请输入合法的信用卡号", - equalTo: "请再次输入相同的值", - accept: "请输入拥有合法后缀名的字符串", - maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"), - minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"), - rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"), - range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"), - max: jQuery.validator.format("请输入一个最大为 {0} 的值"), - min: jQuery.validator.format("请输入一个最小为 {0} 的值") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: CN + */ +jQuery.extend(jQuery.validator.messages, { + required: "必选字段", + remote: "请修正该字段", + email: "请输入正确格式的电子邮件", + url: "请输入合法的网址", + date: "请输入合法的日期", + dateISO: "请输入合法的日期 (ISO).", + number: "请输入合法的数字", + digits: "只能输入整数", + creditcard: "请输入合法的信用卡号", + equalTo: "请再次输入相同的值", + accept: "请输入拥有合法后缀名的字符串", + maxlength: jQuery.validator.format("请输入一个长度最多是 {0} 的字符串"), + minlength: jQuery.validator.format("请输入一个长度最少是 {0} 的字符串"), + rangelength: jQuery.validator.format("请输入一个长度介于 {0} 和 {1} 之间的字符串"), + range: jQuery.validator.format("请输入一个介于 {0} 和 {1} 之间的值"), + max: jQuery.validator.format("请输入一个最大为 {0} 的值"), + min: jQuery.validator.format("请输入一个最小为 {0} 的值") }); \ No newline at end of file diff --git a/localization/messages_cs.js b/localization/messages_cs.js index e1bc901b7..ab998190f 100644 --- a/localization/messages_cs.js +++ b/localization/messages_cs.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: CS - */ -jQuery.extend(jQuery.validator.messages, { - required: "Tento údaj je povinný.", - remote: "Prosím, opravte tento údaj.", - email: "Prosím, zadejte platný e-mail.", - url: "Prosím, zadejte platné URL.", - date: "Prosím, zadejte platné datum.", - dateISO: "Prosím, zadejte platné datum (ISO).", - number: "Prosím, zadejte číslo.", - digits: "Prosím, zadávejte pouze číslice.", - creditcard: "Prosím, zadejte číslo kreditní karty.", - equalTo: "Prosím, zadejte znovu stejnou hodnotu.", - accept: "Prosím, zadejte soubor se správnou příponou.", - maxlength: jQuery.validator.format("Prosím, zadejte nejvíce {0} znaků."), - minlength: jQuery.validator.format("Prosím, zadejte nejméně {0} znaků."), - rangelength: jQuery.validator.format("Prosím, zadejte od {0} do {1} znaků."), - range: jQuery.validator.format("Prosím, zadejte hodnotu od {0} do {1}."), - max: jQuery.validator.format("Prosím, zadejte hodnotu menší nebo rovnu {0}."), - min: jQuery.validator.format("Prosím, zadejte hodnotu větší nebo rovnu {0}.") -}); +/* + * Translated default messages for the jQuery validation plugin. + * Locale: CS + */ +jQuery.extend(jQuery.validator.messages, { + required: "Tento údaj je povinný.", + remote: "Prosím, opravte tento údaj.", + email: "Prosím, zadejte platný e-mail.", + url: "Prosím, zadejte platné URL.", + date: "Prosím, zadejte platné datum.", + dateISO: "Prosím, zadejte platné datum (ISO).", + number: "Prosím, zadejte číslo.", + digits: "Prosím, zadávejte pouze číslice.", + creditcard: "Prosím, zadejte číslo kreditní karty.", + equalTo: "Prosím, zadejte znovu stejnou hodnotu.", + accept: "Prosím, zadejte soubor se správnou příponou.", + maxlength: jQuery.validator.format("Prosím, zadejte nejvíce {0} znaků."), + minlength: jQuery.validator.format("Prosím, zadejte nejméně {0} znaků."), + rangelength: jQuery.validator.format("Prosím, zadejte od {0} do {1} znaků."), + range: jQuery.validator.format("Prosím, zadejte hodnotu od {0} do {1}."), + max: jQuery.validator.format("Prosím, zadejte hodnotu menší nebo rovnu {0}."), + min: jQuery.validator.format("Prosím, zadejte hodnotu větší nebo rovnu {0}.") +}); diff --git a/localization/messages_da.js b/localization/messages_da.js index 07aa93075..1f729e0a0 100644 --- a/localization/messages_da.js +++ b/localization/messages_da.js @@ -1,20 +1,20 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: DA - */ -jQuery.extend(jQuery.validator.messages, { - required: "Dette felt er påkrævet.", - maxlength: jQuery.validator.format("Indtast højst {0} tegn."), - minlength: jQuery.validator.format("Indtast mindst {0} tegn."), - rangelength: jQuery.validator.format("Indtast mindst {0} og højst {1} tegn."), - email: "Indtast en gyldig email-adresse.", - url: "Indtast en gyldig URL.", - date: "Indtast en gyldig dato.", - number: "Indtast et tal.", - digits: "Indtast kun cifre.", - equalTo: "Indtast den samme værdi igen.", - range: jQuery.validator.format("Angiv en værdi mellem {0} og {1}."), - max: jQuery.validator.format("Angiv en værdi der højst er {0}."), - min: jQuery.validator.format("Angiv en værdi der mindst er {0}."), - creditcard: "Indtast et gyldigt kreditkortnummer." -}); +/* + * Translated default messages for the jQuery validation plugin. + * Locale: DA + */ +jQuery.extend(jQuery.validator.messages, { + required: "Dette felt er påkrævet.", + maxlength: jQuery.validator.format("Indtast højst {0} tegn."), + minlength: jQuery.validator.format("Indtast mindst {0} tegn."), + rangelength: jQuery.validator.format("Indtast mindst {0} og højst {1} tegn."), + email: "Indtast en gyldig email-adresse.", + url: "Indtast en gyldig URL.", + date: "Indtast en gyldig dato.", + number: "Indtast et tal.", + digits: "Indtast kun cifre.", + equalTo: "Indtast den samme værdi igen.", + range: jQuery.validator.format("Angiv en værdi mellem {0} og {1}."), + max: jQuery.validator.format("Angiv en værdi der højst er {0}."), + min: jQuery.validator.format("Angiv en værdi der mindst er {0}."), + creditcard: "Indtast et gyldigt kreditkortnummer." +}); diff --git a/localization/messages_de.js b/localization/messages_de.js index b347ca8ef..0c03e3020 100644 --- a/localization/messages_de.js +++ b/localization/messages_de.js @@ -1,20 +1,20 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: DE - */ -jQuery.extend(jQuery.validator.messages, { - required: "Dieses Feld ist ein Pflichtfeld.", - maxlength: jQuery.validator.format("Geben Sie bitte maximal {0} Zeichen ein."), - minlength: jQuery.validator.format("Geben Sie bitte mindestens {0} Zeichen ein."), - rangelength: jQuery.validator.format("Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein."), - email: "Geben Sie bitte eine gültige E-Mail Adresse ein.", - url: "Geben Sie bitte eine gültige URL ein.", - date: "Bitte geben Sie ein gültiges Datum ein.", - number: "Geben Sie bitte eine Nummer ein.", - digits: "Geben Sie bitte nur Ziffern ein.", - equalTo: "Bitte denselben Wert wiederholen.", - range: jQuery.validator.format("Geben Sie bitten einen Wert zwischen {0} und {1}."), - max: jQuery.validator.format("Geben Sie bitte einen Wert kleiner oder gleich {0} ein."), - min: jQuery.validator.format("Geben Sie bitte einen Wert größer oder gleich {0} ein."), - creditcard: "Geben Sie bitte ein gültige Kreditkarten-Nummer ein." +/* + * Translated default messages for the jQuery validation plugin. + * Locale: DE + */ +jQuery.extend(jQuery.validator.messages, { + required: "Dieses Feld ist ein Pflichtfeld.", + maxlength: jQuery.validator.format("Geben Sie bitte maximal {0} Zeichen ein."), + minlength: jQuery.validator.format("Geben Sie bitte mindestens {0} Zeichen ein."), + rangelength: jQuery.validator.format("Geben Sie bitte mindestens {0} und maximal {1} Zeichen ein."), + email: "Geben Sie bitte eine gültige E-Mail Adresse ein.", + url: "Geben Sie bitte eine gültige URL ein.", + date: "Bitte geben Sie ein gültiges Datum ein.", + number: "Geben Sie bitte eine Nummer ein.", + digits: "Geben Sie bitte nur Ziffern ein.", + equalTo: "Bitte denselben Wert wiederholen.", + range: jQuery.validator.format("Geben Sie bitten einen Wert zwischen {0} und {1}."), + max: jQuery.validator.format("Geben Sie bitte einen Wert kleiner oder gleich {0} ein."), + min: jQuery.validator.format("Geben Sie bitte einen Wert größer oder gleich {0} ein."), + creditcard: "Geben Sie bitte ein gültige Kreditkarten-Nummer ein." }); \ No newline at end of file diff --git a/localization/messages_es.js b/localization/messages_es.js index 06cc77cd1..b9a24145d 100644 --- a/localization/messages_es.js +++ b/localization/messages_es.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: ES - */ -jQuery.extend(jQuery.validator.messages, { - required: "Este campo es obligatorio.", - remote: "Por favor, rellena este campo.", - email: "Por favor, escribe una dirección de correo válida", - url: "Por favor, escribe una URL válida.", - date: "Por favor, escribe una fecha válida.", - dateISO: "Por favor, escribe una fecha (ISO) válida.", - number: "Por favor, escribe un número entero válido.", - digits: "Por favor, escribe sólo dígitos.", - creditcard: "Por favor, escribe un número de tarjeta válido.", - equalTo: "Por favor, escribe el mismo valor de nuevo.", - accept: "Por favor, escribe un valor con una extensión aceptada.", - maxlength: jQuery.validator.format("Por favor, no escribas más de {0} caracteres."), - minlength: jQuery.validator.format("Por favor, no escribas menos de {0} caracteres."), - rangelength: jQuery.validator.format("Por favor, escribe un valor entre {0} y {1} caracteres."), - range: jQuery.validator.format("Por favor, escribe un valor entre {0} y {1}."), - max: jQuery.validator.format("Por favor, escribe un valor menor o igual a {0}."), - min: jQuery.validator.format("Por favor, escribe un valor mayor o igual a {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: ES + */ +jQuery.extend(jQuery.validator.messages, { + required: "Este campo es obligatorio.", + remote: "Por favor, rellena este campo.", + email: "Por favor, escribe una dirección de correo válida", + url: "Por favor, escribe una URL válida.", + date: "Por favor, escribe una fecha válida.", + dateISO: "Por favor, escribe una fecha (ISO) válida.", + number: "Por favor, escribe un número entero válido.", + digits: "Por favor, escribe sólo dígitos.", + creditcard: "Por favor, escribe un número de tarjeta válido.", + equalTo: "Por favor, escribe el mismo valor de nuevo.", + accept: "Por favor, escribe un valor con una extensión aceptada.", + maxlength: jQuery.validator.format("Por favor, no escribas más de {0} caracteres."), + minlength: jQuery.validator.format("Por favor, no escribas menos de {0} caracteres."), + rangelength: jQuery.validator.format("Por favor, escribe un valor entre {0} y {1} caracteres."), + range: jQuery.validator.format("Por favor, escribe un valor entre {0} y {1}."), + max: jQuery.validator.format("Por favor, escribe un valor menor o igual a {0}."), + min: jQuery.validator.format("Por favor, escribe un valor mayor o igual a {0}.") }); \ No newline at end of file diff --git a/localization/messages_fr.js b/localization/messages_fr.js index 4d5f2f522..f9e1340cd 100644 --- a/localization/messages_fr.js +++ b/localization/messages_fr.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: FR - */ -jQuery.extend(jQuery.validator.messages, { - required: "Ce champ est requis.", - remote: "Veuillez remplir ce champ pour continuer.", - email: "Veuillez entrer une adresse email valide.", - url: "Veuillez entrer une URL valide.", - date: "Veuillez entrer une date valide.", - dateISO: "Veuillez entrer une date valide (ISO).", - number: "Veuillez entrer un nombre valide.", - digits: "Veuillez entrer (seulement) une valeur numérique.", - creditcard: "Veuillez entrer un numéro de carte de crédit valide.", - equalTo: "Veuillez entrer une nouvelle fois la même valeur.", - accept: "Veuillez entrer une valeur avec une extension valide.", - maxlength: jQuery.validator.format("Veuillez ne pas entrer plus de {0} caractères."), - minlength: jQuery.validator.format("Veuillez entrer au moins {0} caractères."), - rangelength: jQuery.validator.format("Veuillez entrer entre {0} et {1} caractères."), - range: jQuery.validator.format("Veuillez entrer une valeur entre {0} et {1}."), - max: jQuery.validator.format("Veuillez entrer une valeur inférieure ou égale à {0}."), - min: jQuery.validator.format("Veuillez entrer une valeur supérieure ou égale à {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: FR + */ +jQuery.extend(jQuery.validator.messages, { + required: "Ce champ est requis.", + remote: "Veuillez remplir ce champ pour continuer.", + email: "Veuillez entrer une adresse email valide.", + url: "Veuillez entrer une URL valide.", + date: "Veuillez entrer une date valide.", + dateISO: "Veuillez entrer une date valide (ISO).", + number: "Veuillez entrer un nombre valide.", + digits: "Veuillez entrer (seulement) une valeur numérique.", + creditcard: "Veuillez entrer un numéro de carte de crédit valide.", + equalTo: "Veuillez entrer une nouvelle fois la même valeur.", + accept: "Veuillez entrer une valeur avec une extension valide.", + maxlength: jQuery.validator.format("Veuillez ne pas entrer plus de {0} caractères."), + minlength: jQuery.validator.format("Veuillez entrer au moins {0} caractères."), + rangelength: jQuery.validator.format("Veuillez entrer entre {0} et {1} caractères."), + range: jQuery.validator.format("Veuillez entrer une valeur entre {0} et {1}."), + max: jQuery.validator.format("Veuillez entrer une valeur inférieure ou égale à {0}."), + min: jQuery.validator.format("Veuillez entrer une valeur supérieure ou égale à {0}.") }); \ No newline at end of file diff --git a/localization/messages_hu.js b/localization/messages_hu.js index 71252596d..086222aa1 100644 --- a/localization/messages_hu.js +++ b/localization/messages_hu.js @@ -1,20 +1,20 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: HU - */ -jQuery.extend(jQuery.validator.messages, { - required: "Kötelező megadni.", - maxlength: jQuery.validator.format("Legfeljebb {0} karakter hosszú legyen."), - minlength: jQuery.validator.format("Legalább {0} karakter hosszú legyen."), - rangelength: jQuery.validator.format("Legalább {0} és legfeljebb {1} karakter hosszú legyen."), - email: "Érvényes e-mail címnek kell lennie.", - url: "Érvényes URL-nek kell lennie.", - date: "Dátumnak kell lennie.", - number: "Számnak kell lennie.", - digits: "Csak számjegyek lehetnek.", - equalTo: "Meg kell egyeznie a két értéknek.", - range: jQuery.validator.format("{0} és {1} közé kell esnie."), - max: jQuery.validator.format("Nem lehet nagyobb, mint {0}."), - min: jQuery.validator.format("Nem lehet kisebb, mint {0}."), - creditcard: "Érvényes hitelkártyaszámnak kell lennie." -}); +/* + * Translated default messages for the jQuery validation plugin. + * Locale: HU + */ +jQuery.extend(jQuery.validator.messages, { + required: "Kötelező megadni.", + maxlength: jQuery.validator.format("Legfeljebb {0} karakter hosszú legyen."), + minlength: jQuery.validator.format("Legalább {0} karakter hosszú legyen."), + rangelength: jQuery.validator.format("Legalább {0} és legfeljebb {1} karakter hosszú legyen."), + email: "Érvényes e-mail címnek kell lennie.", + url: "Érvényes URL-nek kell lennie.", + date: "Dátumnak kell lennie.", + number: "Számnak kell lennie.", + digits: "Csak számjegyek lehetnek.", + equalTo: "Meg kell egyeznie a két értéknek.", + range: jQuery.validator.format("{0} és {1} közé kell esnie."), + max: jQuery.validator.format("Nem lehet nagyobb, mint {0}."), + min: jQuery.validator.format("Nem lehet kisebb, mint {0}."), + creditcard: "Érvényes hitelkártyaszámnak kell lennie." +}); diff --git a/localization/messages_kk.js b/localization/messages_kk.js index 358b3025b..b37789463 100644 --- a/localization/messages_kk.js +++ b/localization/messages_kk.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: KK - */ -jQuery.extend(jQuery.validator.messages, { - required: "Бұл өрісті міндетті түрде толтырыңыз.", - remote: "Дұрыс мағына енгізуіңізді сұраймыз.", - email: "Нақты электронды поштаңызды енгізуіңізді сұраймыз.", - url: "Нақты URL-ды енгізуіңізді сұраймыз.", - date: "Нақты URL-ды енгізуіңізді сұраймыз.", - dateISO: "Нақты ISO форматымен сәйкес датасын енгізуіңізді сұраймыз.", - number: "Күнді енгізуіңізді сұраймыз.", - digits: "Тек қана сандарды енгізуіңізді сұраймыз.", - creditcard: "Несие картасының нөмірін дұрыс енгізуіңізді сұраймыз.", - equalTo: "Осы мәнді қайта енгізуіңізді сұраймыз.", - accept: "Файлдың кеңейтуін дұрыс таңдаңыз.", - maxlength: jQuery.format("Ұзындығы {0} символдан көр болмасын."), - minlength: jQuery.format("Ұзындығы {0} символдан аз болмасын."), - rangelength: jQuery.format("Ұзындығы {0}-{1} дейін мән енгізуіңізді сұраймыз."), - range: jQuery.format("Пожалуйста, введите число от {0} до {1}. - {0} - {1} санын енгізуіңізді сұраймыз."), - max: jQuery.format("{0} аз немесе тең санын енгізуіңіді сұраймыз."), - min: jQuery.format("{0} көп немесе тең санын енгізуіңізді сұраймыз.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: KK + */ +jQuery.extend(jQuery.validator.messages, { + required: "Бұл өрісті міндетті түрде толтырыңыз.", + remote: "Дұрыс мағына енгізуіңізді сұраймыз.", + email: "Нақты электронды поштаңызды енгізуіңізді сұраймыз.", + url: "Нақты URL-ды енгізуіңізді сұраймыз.", + date: "Нақты URL-ды енгізуіңізді сұраймыз.", + dateISO: "Нақты ISO форматымен сәйкес датасын енгізуіңізді сұраймыз.", + number: "Күнді енгізуіңізді сұраймыз.", + digits: "Тек қана сандарды енгізуіңізді сұраймыз.", + creditcard: "Несие картасының нөмірін дұрыс енгізуіңізді сұраймыз.", + equalTo: "Осы мәнді қайта енгізуіңізді сұраймыз.", + accept: "Файлдың кеңейтуін дұрыс таңдаңыз.", + maxlength: jQuery.format("Ұзындығы {0} символдан көр болмасын."), + minlength: jQuery.format("Ұзындығы {0} символдан аз болмасын."), + rangelength: jQuery.format("Ұзындығы {0}-{1} дейін мән енгізуіңізді сұраймыз."), + range: jQuery.format("Пожалуйста, введите число от {0} до {1}. - {0} - {1} санын енгізуіңізді сұраймыз."), + max: jQuery.format("{0} аз немесе тең санын енгізуіңіді сұраймыз."), + min: jQuery.format("{0} көп немесе тең санын енгізуіңізді сұраймыз.") }); \ No newline at end of file diff --git a/localization/messages_nl.js b/localization/messages_nl.js index 5f03d5425..e266158a8 100644 --- a/localization/messages_nl.js +++ b/localization/messages_nl.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: NL - */ -jQuery.extend(jQuery.validator.messages, { - required: "Dit is een verplicht veld.", - remote: "Controleer dit veld.", - email: "Vul hier een geldig e-mailadres in.", - url: "Vul hier een geldige URL in.", - date: "Vul hier een geldige datum in.", - dateISO: "Vul hier een geldige datum in (ISO-formaat).", - number: "Vul hier een geldig getal in.", - digits: "Vul hier alleen getallen in.", - creditcard: "Vul hier een geldig creditcardnummer in.", - equalTo: "Vul hier dezelfde waarde in.", - accept: "Vul hier een waarde in met een geldige extensie.", - maxlength: jQuery.validator.format("Vul hier maximaal {0} tekens in."), - minlength: jQuery.validator.format("Vul hier minimaal {0} tekens in."), - rangelength: jQuery.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1} tekens."), - range: jQuery.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1}."), - max: jQuery.validator.format("Vul hier een waarde in kleiner dan of gelijk aan {0}."), - min: jQuery.validator.format("Vul hier een waarde in groter dan of gelijk aan {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: NL + */ +jQuery.extend(jQuery.validator.messages, { + required: "Dit is een verplicht veld.", + remote: "Controleer dit veld.", + email: "Vul hier een geldig e-mailadres in.", + url: "Vul hier een geldige URL in.", + date: "Vul hier een geldige datum in.", + dateISO: "Vul hier een geldige datum in (ISO-formaat).", + number: "Vul hier een geldig getal in.", + digits: "Vul hier alleen getallen in.", + creditcard: "Vul hier een geldig creditcardnummer in.", + equalTo: "Vul hier dezelfde waarde in.", + accept: "Vul hier een waarde in met een geldige extensie.", + maxlength: jQuery.validator.format("Vul hier maximaal {0} tekens in."), + minlength: jQuery.validator.format("Vul hier minimaal {0} tekens in."), + rangelength: jQuery.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1} tekens."), + range: jQuery.validator.format("Vul hier een waarde in van minimaal {0} en maximaal {1}."), + max: jQuery.validator.format("Vul hier een waarde in kleiner dan of gelijk aan {0}."), + min: jQuery.validator.format("Vul hier een waarde in groter dan of gelijk aan {0}.") }); \ No newline at end of file diff --git a/localization/messages_no.js b/localization/messages_no.js index 4230b2aeb..89706fc36 100644 --- a/localization/messages_no.js +++ b/localization/messages_no.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: NO (Norwegian) - */ -jQuery.extend(jQuery.validator.messages, { - required: "Dette feltet er obligatorisk.", - maxlength: jQuery.validator.format("Maksimalt {0} tegn."), - minlength: jQuery.validator.format("Minimum {0} tegn."), - rangelength: jQuery.validator.format("Angi minimum {0} og maksimum {1} tegn."), - email: "Oppgi en gyldig epostadresse.", - url: "Angi en gyldig URL.", - date: "Angi en gyldig dato.", - dateISO: "Angi en gyldig dato (&ARING;&ARING;&ARING;&ARING;-MM-DD).", - dateSE: "Angi en gyldig dato.", - number: "Angi et gyldig nummer.", - numberSE: "Angi et gyldig nummer.", - digits: "Skriv kun tall.", - equalTo: "Skriv samme verdi igjen.", - range: jQuery.validator.format("Angi en verdi mellom {0} og {1}."), - max: jQuery.validator.format("Angi en verdi som er større eller lik {0}."), - min: jQuery.validator.format("Angi en verdi som er mindre eller lik {0}."), - creditcard: "Angi et gyldig kredittkortnummer." +/* + * Translated default messages for the jQuery validation plugin. + * Locale: NO (Norwegian) + */ +jQuery.extend(jQuery.validator.messages, { + required: "Dette feltet er obligatorisk.", + maxlength: jQuery.validator.format("Maksimalt {0} tegn."), + minlength: jQuery.validator.format("Minimum {0} tegn."), + rangelength: jQuery.validator.format("Angi minimum {0} og maksimum {1} tegn."), + email: "Oppgi en gyldig epostadresse.", + url: "Angi en gyldig URL.", + date: "Angi en gyldig dato.", + dateISO: "Angi en gyldig dato (&ARING;&ARING;&ARING;&ARING;-MM-DD).", + dateSE: "Angi en gyldig dato.", + number: "Angi et gyldig nummer.", + numberSE: "Angi et gyldig nummer.", + digits: "Skriv kun tall.", + equalTo: "Skriv samme verdi igjen.", + range: jQuery.validator.format("Angi en verdi mellom {0} og {1}."), + max: jQuery.validator.format("Angi en verdi som er større eller lik {0}."), + min: jQuery.validator.format("Angi en verdi som er mindre eller lik {0}."), + creditcard: "Angi et gyldig kredittkortnummer." }); \ No newline at end of file diff --git a/localization/messages_pl.js b/localization/messages_pl.js index ba7288d07..27190d8a3 100644 --- a/localization/messages_pl.js +++ b/localization/messages_pl.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: PL - */ -jQuery.extend(jQuery.validator.messages, { - required: "To pole jest wymagane.", - remote: "Proszę o wypełnienie tego pola.", - email: "Proszę o podanie prawidłowego adresu email.", - url: "Proszę o podanie prawidłowego URL.", - date: "Proszę o podanie prawidłowej daty.", - dateISO: "Proszę o podanie prawidłowej daty (ISO).", - number: "Proszę o podanie prawidłowej liczby.", - digits: "Proszę o podanie samych cyfr.", - creditcard: "Proszę o podanie prawidłowej karty kredytowej.", - equalTo: "Proszę o podanie tej samej wartości ponownie.", - accept: "Proszę o podanie wartości z prawidłowym rozszerzeniem.", - maxlength: jQuery.validator.format("Proszę o podanie nie więcej niż {0} znaków."), - minlength: jQuery.validator.format("Proszę o podanie przynajmniej {0} znaków."), - rangelength: jQuery.validator.format("Proszę o podanie wartości o długości od {0} do {1} znaków."), - range: jQuery.validator.format("Proszę o podanie wartości z przedziału od {0} do {1}."), - max: jQuery.validator.format("Proszę o podanie wartości mniejszej bądź równej {0}."), - min: jQuery.validator.format("Proszę o podanie wartości większej bądź równej {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: PL + */ +jQuery.extend(jQuery.validator.messages, { + required: "To pole jest wymagane.", + remote: "Proszę o wypełnienie tego pola.", + email: "Proszę o podanie prawidłowego adresu email.", + url: "Proszę o podanie prawidłowego URL.", + date: "Proszę o podanie prawidłowej daty.", + dateISO: "Proszę o podanie prawidłowej daty (ISO).", + number: "Proszę o podanie prawidłowej liczby.", + digits: "Proszę o podanie samych cyfr.", + creditcard: "Proszę o podanie prawidłowej karty kredytowej.", + equalTo: "Proszę o podanie tej samej wartości ponownie.", + accept: "Proszę o podanie wartości z prawidłowym rozszerzeniem.", + maxlength: jQuery.validator.format("Proszę o podanie nie więcej niż {0} znaków."), + minlength: jQuery.validator.format("Proszę o podanie przynajmniej {0} znaków."), + rangelength: jQuery.validator.format("Proszę o podanie wartości o długości od {0} do {1} znaków."), + range: jQuery.validator.format("Proszę o podanie wartości z przedziału od {0} do {1}."), + max: jQuery.validator.format("Proszę o podanie wartości mniejszej bądź równej {0}."), + min: jQuery.validator.format("Proszę o podanie wartości większej bądź równej {0}.") }); \ No newline at end of file diff --git a/localization/messages_ptbr.js b/localization/messages_ptbr.js index 4201ad2dc..07118575b 100644 --- a/localization/messages_ptbr.js +++ b/localization/messages_ptbr.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: PT_BR - */ -jQuery.extend(jQuery.validator.messages, { - required: "Este campo é requerido.", - remote: "Por favor, corrija este campo.", - email: "Por favor, forneça um endereço eletrônico válido.", - url: "Por favor, forneça uma URL válida.", - date: "Por favor, forneça uma data válida.", - dateISO: "Por favor, forneça uma data válida (ISO).", - number: "Por favor, forneça um número válida.", - digits: "Por favor, forneça somente dígitos.", - creditcard: "Por favor, forneça um cartão de crédito válido.", - equalTo: "Por favor, forneça o mesmo valor novamente.", - accept: "Por favor, forneça um valor com uma extensão válida.", - maxlength: jQuery.validator.format("Por favor, forneça não mais que {0} caracteres."), - minlength: jQuery.validator.format("Por favor, forneça ao menos {0} caracteres."), - rangelength: jQuery.validator.format("Por favor, forneça um valor entre {0} e {1} caracteres de comprimento."), - range: jQuery.validator.format("Por favor, forneça um valor entre {0} e {1}."), - max: jQuery.validator.format("Por favor, forneça um valor menor ou igual a {0}."), - min: jQuery.validator.format("Por favor, forneça um valor maior ou igual a {0}.") -}); +/* + * Translated default messages for the jQuery validation plugin. + * Locale: PT_BR + */ +jQuery.extend(jQuery.validator.messages, { + required: "Este campo é requerido.", + remote: "Por favor, corrija este campo.", + email: "Por favor, forneça um endereço eletrônico válido.", + url: "Por favor, forneça uma URL válida.", + date: "Por favor, forneça uma data válida.", + dateISO: "Por favor, forneça uma data válida (ISO).", + number: "Por favor, forneça um número válida.", + digits: "Por favor, forneça somente dígitos.", + creditcard: "Por favor, forneça um cartão de crédito válido.", + equalTo: "Por favor, forneça o mesmo valor novamente.", + accept: "Por favor, forneça um valor com uma extensão válida.", + maxlength: jQuery.validator.format("Por favor, forneça não mais que {0} caracteres."), + minlength: jQuery.validator.format("Por favor, forneça ao menos {0} caracteres."), + rangelength: jQuery.validator.format("Por favor, forneça um valor entre {0} e {1} caracteres de comprimento."), + range: jQuery.validator.format("Por favor, forneça um valor entre {0} e {1}."), + max: jQuery.validator.format("Por favor, forneça um valor menor ou igual a {0}."), + min: jQuery.validator.format("Por favor, forneça um valor maior ou igual a {0}.") +}); diff --git a/localization/messages_ptpt.js b/localization/messages_ptpt.js index 51c057af3..1e3fea29c 100644 --- a/localization/messages_ptpt.js +++ b/localization/messages_ptpt.js @@ -1,23 +1,23 @@ -/** - * Translated default messages for the jQuery validation plugin. - * Locale: PT_PT - */ -jQuery.extend(jQuery.validator.messages, { - required: "Campo de preenchimento obrigatório.", - remote: "Por favor, corrija este campo.", - email: "Por favor, introduza um endereço eletrónico válido.", - url: "Por favor, introduza um URL válido.", - date: "Por favor, introduza uma data válida.", - dateISO: "Por favor, introduza uma data válida (ISO).", - number: "Por favor, introduza um número válido.", - digits: "Por favor, introduza apenas dígitos.", - creditcard: "Por favor, introduza um número de cartão de crédito válido.", - equalTo: "Por favor, introduza de novo o mesmo valor.", - accept: "Por favor, introduza um ficheiro com uma extensão válida.", - maxlength: jQuery.validator.format("Por favor, não introduza mais do que {0} caracteres."), - minlength: jQuery.validator.format("Por favor, introduza pelo menos {0} caracteres."), - rangelength: jQuery.validator.format("Por favor, introduza entre {0} e {1} caracteres."), - range: jQuery.validator.format("Por favor, introduza um valor entre {0} e {1}."), - max: jQuery.validator.format("Por favor, introduza um valor menor ou igual a {0}."), - min: jQuery.validator.format("Por favor, introduza um valor maior ou igual a {0}.") -}); +/** + * Translated default messages for the jQuery validation plugin. + * Locale: PT_PT + */ +jQuery.extend(jQuery.validator.messages, { + required: "Campo de preenchimento obrigatório.", + remote: "Por favor, corrija este campo.", + email: "Por favor, introduza um endereço eletrónico válido.", + url: "Por favor, introduza um URL válido.", + date: "Por favor, introduza uma data válida.", + dateISO: "Por favor, introduza uma data válida (ISO).", + number: "Por favor, introduza um número válido.", + digits: "Por favor, introduza apenas dígitos.", + creditcard: "Por favor, introduza um número de cartão de crédito válido.", + equalTo: "Por favor, introduza de novo o mesmo valor.", + accept: "Por favor, introduza um ficheiro com uma extensão válida.", + maxlength: jQuery.validator.format("Por favor, não introduza mais do que {0} caracteres."), + minlength: jQuery.validator.format("Por favor, introduza pelo menos {0} caracteres."), + rangelength: jQuery.validator.format("Por favor, introduza entre {0} e {1} caracteres."), + range: jQuery.validator.format("Por favor, introduza um valor entre {0} e {1}."), + max: jQuery.validator.format("Por favor, introduza um valor menor ou igual a {0}."), + min: jQuery.validator.format("Por favor, introduza um valor maior ou igual a {0}.") +}); diff --git a/localization/messages_ro.js b/localization/messages_ro.js index f07ff39a7..ae9a67cf9 100644 --- a/localization/messages_ro.js +++ b/localization/messages_ro.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: RO - */ -jQuery.extend(jQuery.validator.messages, { - required: "Acest câmp este obligatoriu.", - remote: "Te rugăm să completezi acest câmp.", - email: "Te rugăm să introduci o adresă de email validă", - url: "Te rugăm sa introduci o adresă URL validă.", - date: "Te rugăm să introduci o dată corectă.", - dateISO: "Te rugăm să introduci o dată (ISO) corectă.", - number: "Te rugăm să introduci un număr întreg valid.", - digits: "Te rugăm să introduci doar cifre.", - creditcard: "Te rugăm să introduci un numar de carte de credit valid.", - equalTo: "Te rugăm să reintroduci valoarea.", - accept: "Te rugăm să introduci o valoare cu o extensie validă.", - maxlength: jQuery.validator.format("Te rugăm să nu introduci mai mult de {0} caractere."), - minlength: jQuery.validator.format("Te rugăm să introduci cel puțin {0} caractere."), - rangelength: jQuery.validator.format("Te rugăm să introduci o valoare între {0} și {1} caractere."), - range: jQuery.validator.format("Te rugăm să introduci o valoare între {0} și {1}."), - max: jQuery.validator.format("Te rugăm să introduci o valoare egal sau mai mică decât {0}."), - min: jQuery.validator.format("Te rugăm să introduci o valoare egal sau mai mare decât {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: RO + */ +jQuery.extend(jQuery.validator.messages, { + required: "Acest câmp este obligatoriu.", + remote: "Te rugăm să completezi acest câmp.", + email: "Te rugăm să introduci o adresă de email validă", + url: "Te rugăm sa introduci o adresă URL validă.", + date: "Te rugăm să introduci o dată corectă.", + dateISO: "Te rugăm să introduci o dată (ISO) corectă.", + number: "Te rugăm să introduci un număr întreg valid.", + digits: "Te rugăm să introduci doar cifre.", + creditcard: "Te rugăm să introduci un numar de carte de credit valid.", + equalTo: "Te rugăm să reintroduci valoarea.", + accept: "Te rugăm să introduci o valoare cu o extensie validă.", + maxlength: jQuery.validator.format("Te rugăm să nu introduci mai mult de {0} caractere."), + minlength: jQuery.validator.format("Te rugăm să introduci cel puțin {0} caractere."), + rangelength: jQuery.validator.format("Te rugăm să introduci o valoare între {0} și {1} caractere."), + range: jQuery.validator.format("Te rugăm să introduci o valoare între {0} și {1}."), + max: jQuery.validator.format("Te rugăm să introduci o valoare egal sau mai mică decât {0}."), + min: jQuery.validator.format("Te rugăm să introduci o valoare egal sau mai mare decât {0}.") }); \ No newline at end of file diff --git a/localization/messages_ru.js b/localization/messages_ru.js index 3bfbfb125..419ac24db 100644 --- a/localization/messages_ru.js +++ b/localization/messages_ru.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: RU - */ -jQuery.extend(jQuery.validator.messages, { - required: "Это поле необходимо заполнить.", - remote: "Пожалуйста, введите правильное значение.", - email: "Пожалуйста, введите корретный адрес электронной почты.", - url: "Пожалуйста, введите корректный URL.", - date: "Пожалуйста, введите корректную дату.", - dateISO: "Пожалуйста, введите корректную дату в формате ISO.", - number: "Пожалуйста, введите число.", - digits: "Пожалуйста, вводите только цифры.", - creditcard: "Пожалуйста, введите правильный номер кредитной карты.", - equalTo: "Пожалуйста, введите такое же значение ещё раз.", - accept: "Пожалуйста, выберите файл с правильным расширением.", - maxlength: jQuery.validator.format("Пожалуйста, введите не больше {0} символов."), - minlength: jQuery.validator.format("Пожалуйста, введите не меньше {0} символов."), - rangelength: jQuery.validator.format("Пожалуйста, введите значение длиной от {0} до {1} символов."), - range: jQuery.validator.format("Пожалуйста, введите число от {0} до {1}."), - max: jQuery.validator.format("Пожалуйста, введите число, меньшее или равное {0}."), - min: jQuery.validator.format("Пожалуйста, введите число, большее или равное {0}.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: RU + */ +jQuery.extend(jQuery.validator.messages, { + required: "Это поле необходимо заполнить.", + remote: "Пожалуйста, введите правильное значение.", + email: "Пожалуйста, введите корретный адрес электронной почты.", + url: "Пожалуйста, введите корректный URL.", + date: "Пожалуйста, введите корректную дату.", + dateISO: "Пожалуйста, введите корректную дату в формате ISO.", + number: "Пожалуйста, введите число.", + digits: "Пожалуйста, вводите только цифры.", + creditcard: "Пожалуйста, введите правильный номер кредитной карты.", + equalTo: "Пожалуйста, введите такое же значение ещё раз.", + accept: "Пожалуйста, выберите файл с правильным расширением.", + maxlength: jQuery.validator.format("Пожалуйста, введите не больше {0} символов."), + minlength: jQuery.validator.format("Пожалуйста, введите не меньше {0} символов."), + rangelength: jQuery.validator.format("Пожалуйста, введите значение длиной от {0} до {1} символов."), + range: jQuery.validator.format("Пожалуйста, введите число от {0} до {1}."), + max: jQuery.validator.format("Пожалуйста, введите число, меньшее или равное {0}."), + min: jQuery.validator.format("Пожалуйста, введите число, большее или равное {0}.") }); \ No newline at end of file diff --git a/localization/messages_tr.js b/localization/messages_tr.js index 2b6d1be36..9df81e47e 100644 --- a/localization/messages_tr.js +++ b/localization/messages_tr.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: TR - */ -jQuery.extend(jQuery.validator.messages, { - required: "Bu alanın doldurulması zorunludur.", - remote: "Lütfen bu alanı düzeltin.", - email: "Lütfen geçerli bir e-posta adresi giriniz.", - url: "Lütfen geçerli bir web adresi (URL) giriniz.", - date: "Lütfen geçerli bir tarih giriniz.", - dateISO: "Lütfen geçerli bir tarih giriniz(ISO formatında)", - number: "Lütfen geçerli bir sayı giriniz.", - digits: "Lütfen sadece sayısal karakterler giriniz.", - creditcard: "Lütfen geçerli bir kredi kartı giriniz.", - equalTo: "Lütfen aynı değeri tekrar giriniz.", - accept: "Lütfen geçerli uzantıya sahip bir değer giriniz.", - maxlength: jQuery.validator.format("Lütfen en fazla {0} karakter uzunluğunda bir değer giriniz."), - minlength: jQuery.validator.format("Lütfen en az {0} karakter uzunluğunda bir değer giriniz."), - rangelength: jQuery.validator.format("Lütfen en az {0} ve en fazla {1} uzunluğunda bir değer giriniz."), - range: jQuery.validator.format("Lütfen {0} ile {1} arasında bir değer giriniz."), - max: jQuery.validator.format("Lütfen {0} değerine eşit ya da daha küçük bir değer giriniz."), - min: jQuery.validator.format("Lütfen {0} değerine eşit ya da daha büyük bir değer giriniz.") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: TR + */ +jQuery.extend(jQuery.validator.messages, { + required: "Bu alanın doldurulması zorunludur.", + remote: "Lütfen bu alanı düzeltin.", + email: "Lütfen geçerli bir e-posta adresi giriniz.", + url: "Lütfen geçerli bir web adresi (URL) giriniz.", + date: "Lütfen geçerli bir tarih giriniz.", + dateISO: "Lütfen geçerli bir tarih giriniz(ISO formatında)", + number: "Lütfen geçerli bir sayı giriniz.", + digits: "Lütfen sadece sayısal karakterler giriniz.", + creditcard: "Lütfen geçerli bir kredi kartı giriniz.", + equalTo: "Lütfen aynı değeri tekrar giriniz.", + accept: "Lütfen geçerli uzantıya sahip bir değer giriniz.", + maxlength: jQuery.validator.format("Lütfen en fazla {0} karakter uzunluğunda bir değer giriniz."), + minlength: jQuery.validator.format("Lütfen en az {0} karakter uzunluğunda bir değer giriniz."), + rangelength: jQuery.validator.format("Lütfen en az {0} ve en fazla {1} uzunluğunda bir değer giriniz."), + range: jQuery.validator.format("Lütfen {0} ile {1} arasında bir değer giriniz."), + max: jQuery.validator.format("Lütfen {0} değerine eşit ya da daha küçük bir değer giriniz."), + min: jQuery.validator.format("Lütfen {0} değerine eşit ya da daha büyük bir değer giriniz.") }); \ No newline at end of file diff --git a/localization/messages_tw.js b/localization/messages_tw.js index e2d879c1e..248153518 100644 --- a/localization/messages_tw.js +++ b/localization/messages_tw.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: TW (Taiwan - Traditional Chinese) - */ -jQuery.extend(jQuery.validator.messages, { - required: "必填", - remote: "請修正此欄位", - email: "請輸入正確的電子信箱", - url: "請輸入合法的URL", - date: "請輸入合法的日期", - dateISO: "請輸入合法的日期 (ISO).", - number: "請輸入數字", - digits: "請輸入整數", - creditcard: "請輸入合法的信用卡號碼", - equalTo: "請重複輸入一次", - accept: "請輸入有效的後缀字串", - maxlength: jQuery.validator.format("請輸入長度不大於{0} 的字串"), - minlength: jQuery.validator.format("請輸入長度不小於 {0} 的字串"), - rangelength: jQuery.validator.format("請輸入長度介於 {0} 和 {1} 之間的字串"), - range: jQuery.validator.format("請輸入介於 {0} 和 {1} 之間的數值"), - max: jQuery.validator.format("請輸入不大於 {0} 的數值"), - min: jQuery.validator.format("請輸入不小於 {0} 的數值") +/* + * Translated default messages for the jQuery validation plugin. + * Locale: TW (Taiwan - Traditional Chinese) + */ +jQuery.extend(jQuery.validator.messages, { + required: "必填", + remote: "請修正此欄位", + email: "請輸入正確的電子信箱", + url: "請輸入合法的URL", + date: "請輸入合法的日期", + dateISO: "請輸入合法的日期 (ISO).", + number: "請輸入數字", + digits: "請輸入整數", + creditcard: "請輸入合法的信用卡號碼", + equalTo: "請重複輸入一次", + accept: "請輸入有效的後缀字串", + maxlength: jQuery.validator.format("請輸入長度不大於{0} 的字串"), + minlength: jQuery.validator.format("請輸入長度不小於 {0} 的字串"), + rangelength: jQuery.validator.format("請輸入長度介於 {0} 和 {1} 之間的字串"), + range: jQuery.validator.format("請輸入介於 {0} 和 {1} 之間的數值"), + max: jQuery.validator.format("請輸入不大於 {0} 的數值"), + min: jQuery.validator.format("請輸入不小於 {0} 的數值") }); \ No newline at end of file diff --git a/localization/messages_ua.js b/localization/messages_ua.js index 0843e64a0..25434a65f 100644 --- a/localization/messages_ua.js +++ b/localization/messages_ua.js @@ -1,23 +1,23 @@ -/* - * Translated default messages for the jQuery validation plugin. - * Locale: UA (Ukrainian) - */ -jQuery.extend(jQuery.validator.messages, { - required: "Це поле необхідно заповнити.", - remote: "Будь ласка, введіть правильне значення.", - email: "Будь ласка, введіть коректну адресу електронної пошти.", - url: "Будь ласка, введіть коректний URL.", - date: "Будь ласка, введіть коректну дату.", - dateISO: "Будь ласка, введіть коректну дату у форматі ISO.", - number: "Будь ласка, введіть число.", - digits: "Вводите потрібно лише цифри.", - creditcard: "Будь ласка, введіть правильний номер кредитної карти.", - equalTo: "Будь ласка, введіть таке ж значення ще раз.", - accept: "Будь ласка, виберіть файл з правильним розширенням.", - maxlength: jQuery.validator.format("Будь ласка, введіть не більше {0} символів."), - minlength: jQuery.validator.format("Будь ласка, введіть не менше {0} символів."), - rangelength: jQuery.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."), - range: jQuery.validator.format("Будь ласка, введіть число від {0} до {1}."), - max: jQuery.validator.format("Будь ласка, введіть число, менше або рівно {0}."), - min: jQuery.validator.format("Будь ласка, введіть число, більше або рівно {0}.") -}); +/* + * Translated default messages for the jQuery validation plugin. + * Locale: UA (Ukrainian) + */ +jQuery.extend(jQuery.validator.messages, { + required: "Це поле необхідно заповнити.", + remote: "Будь ласка, введіть правильне значення.", + email: "Будь ласка, введіть коректну адресу електронної пошти.", + url: "Будь ласка, введіть коректний URL.", + date: "Будь ласка, введіть коректну дату.", + dateISO: "Будь ласка, введіть коректну дату у форматі ISO.", + number: "Будь ласка, введіть число.", + digits: "Вводите потрібно лише цифри.", + creditcard: "Будь ласка, введіть правильний номер кредитної карти.", + equalTo: "Будь ласка, введіть таке ж значення ще раз.", + accept: "Будь ласка, виберіть файл з правильним розширенням.", + maxlength: jQuery.validator.format("Будь ласка, введіть не більше {0} символів."), + minlength: jQuery.validator.format("Будь ласка, введіть не менше {0} символів."), + rangelength: jQuery.validator.format("Будь ласка, введіть значення довжиною від {0} до {1} символів."), + range: jQuery.validator.format("Будь ласка, введіть число від {0} до {1}."), + max: jQuery.validator.format("Будь ласка, введіть число, менше або рівно {0}."), + min: jQuery.validator.format("Будь ласка, введіть число, більше або рівно {0}.") +}); diff --git a/localization/methods_de.js b/localization/methods_de.js index 31a7a7b88..3e8ac8437 100644 --- a/localization/methods_de.js +++ b/localization/methods_de.js @@ -1,12 +1,12 @@ -/* - * Localized default methods for the jQuery validation plugin. - * Locale: DE - */ -jQuery.extend(jQuery.validator.methods, { - date: function(value, element) { - return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value); - }, - number: function(value, element) { - return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value); - } +/* + * Localized default methods for the jQuery validation plugin. + * Locale: DE + */ +jQuery.extend(jQuery.validator.methods, { + date: function(value, element) { + return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value); + }, + number: function(value, element) { + return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value); + } }); \ No newline at end of file diff --git a/localization/methods_nl.js b/localization/methods_nl.js index 788eca420..152e94de0 100644 --- a/localization/methods_nl.js +++ b/localization/methods_nl.js @@ -1,9 +1,9 @@ -/* - * Localized default methods for the jQuery validation plugin. - * Locale: NL - */ -jQuery.extend(jQuery.validator.methods, { - date: function(value, element) { - return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value); - } +/* + * Localized default methods for the jQuery validation plugin. + * Locale: NL + */ +jQuery.extend(jQuery.validator.methods, { + date: function(value, element) { + return this.optional(element) || /^\d\d?[\.\/-]\d\d?[\.\/-]\d\d\d?\d?$/.test(value); + } }); \ No newline at end of file diff --git a/localization/methods_pt.js b/localization/methods_pt.js index 0a22ac5bf..21879d3bb 100644 --- a/localization/methods_pt.js +++ b/localization/methods_pt.js @@ -1,9 +1,9 @@ -/* - * Localized default methods for the jQuery validation plugin. - * Locale: PT_BR - */ -jQuery.extend(jQuery.validator.methods, { - date: function(value, element) { - return this.optional(element) || /^\d\d?\/\d\d?\/\d\d\d?\d?$/.test(value); - } +/* + * Localized default methods for the jQuery validation plugin. + * Locale: PT_BR + */ +jQuery.extend(jQuery.validator.methods, { + date: function(value, element) { + return this.optional(element) || /^\d\d?\/\d\d?\/\d\d\d?\d?$/.test(value); + } }); \ No newline at end of file diff --git a/test/events.html b/test/events.html index 3c828173b..a6515197e 100644 --- a/test/events.html +++ b/test/events.html @@ -7,8 +7,8 @@ - - - - - +
    - A simple comment form with submit validation and default messages -

    - + A simple comment form with submit validation and default messages +

    +

    -

    -

    - - -

    -

    - - +

    +

    + + +

    +

    + +

    @@ -65,7 +65,7 @@

    - + \ No newline at end of file diff --git a/test/firebug/firebug.js b/test/firebug/firebug.js index 35ada7606..eb853b824 100644 --- a/test/firebug/firebug.js +++ b/test/firebug/firebug.js @@ -1,672 +1,672 @@ - -if (!("console" in window) || !("firebug" in console)) { -(function() -{ - window.console = - { - log: function() - { - logFormatted(arguments, ""); - }, - - debug: function() - { - logFormatted(arguments, "debug"); - }, - - info: function() - { - logFormatted(arguments, "info"); - }, - - warn: function() - { - logFormatted(arguments, "warning"); - }, - - error: function() - { - logFormatted(arguments, "error"); - }, - - assert: function(truth, message) - { - if (!truth) - { - var args = []; - for (var i = 1; i < arguments.length; ++i) - args.push(arguments[i]); - - logFormatted(args.length ? args : ["Assertion Failure"], "error"); - throw message ? message : "Assertion Failure"; - } - }, - - dir: function(object) - { - var html = []; - - var pairs = []; - for (var name in object) - { - try - { - pairs.push([name, object[name]]); - } - catch (exc) - { - } - } - - pairs.sort(function(a, b) { return a[0] < b[0] ? -1 : 1; }); - - html.push(''); - for (var i = 0; i < pairs.length; ++i) - { - var name = pairs[i][0], value = pairs[i][1]; - - html.push('', - '', ''); - } - html.push('
    ', - escapeHTML(name), ''); - appendObject(value, html); - html.push('
    '); - - logRow(html, "dir"); - }, - - dirxml: function(node) - { - var html = []; - - appendNode(node, html); - logRow(html, "dirxml"); - }, - - group: function() - { - logRow(arguments, "group", pushGroup); - }, - - groupEnd: function() - { - logRow(arguments, "", popGroup); - }, - - time: function(name) - { - timeMap[name] = (new Date()).getTime(); - }, - - timeEnd: function(name) - { - if (name in timeMap) - { - var delta = (new Date()).getTime() - timeMap[name]; - logFormatted([name+ ":", delta+"ms"]); - delete timeMap[name]; - } - }, - - count: function() - { - this.warn(["count() not supported."]); - }, - - trace: function() - { - this.warn(["trace() not supported."]); - }, - - profile: function() - { - this.warn(["profile() not supported."]); - }, - - profileEnd: function() - { - }, - - clear: function() - { - consoleBody.innerHTML = ""; - }, - - open: function() - { - toggleConsole(true); - }, - - close: function() - { - if (frameVisible) - toggleConsole(); - } - }; - - // ******************************************************************************************** - - var consoleFrame = null; - var consoleBody = null; - var commandLine = null; - - var frameVisible = false; - var messageQueue = []; - var groupStack = []; - var timeMap = {}; - - var clPrefix = ">>> "; - - var isFirefox = navigator.userAgent.indexOf("Firefox") != -1; - var isIE = navigator.userAgent.indexOf("MSIE") != -1; - var isOpera = navigator.userAgent.indexOf("Opera") != -1; - var isSafari = navigator.userAgent.indexOf("AppleWebKit") != -1; - - // ******************************************************************************************** - - function toggleConsole(forceOpen) - { - frameVisible = forceOpen || !frameVisible; - if (consoleFrame) - consoleFrame.style.visibility = frameVisible ? "visible" : "hidden"; - else - waitForBody(); - } - - function focusCommandLine() - { - toggleConsole(true); - if (commandLine) - commandLine.focus(); - } - - function waitForBody() - { - if (document.body) - createFrame(); - else - setTimeout(waitForBody, 200); - } - - function createFrame() - { - if (consoleFrame) - return; - - window.onFirebugReady = function(doc) - { - window.onFirebugReady = null; - - var toolbar = doc.getElementById("toolbar"); - toolbar.onmousedown = onSplitterMouseDown; - - commandLine = doc.getElementById("commandLine"); - addEvent(commandLine, "keydown", onCommandLineKeyDown); - - addEvent(doc, isIE || isSafari ? "keydown" : "keypress", onKeyDown); - - consoleBody = doc.getElementById("log"); - layout(); - flush(); - } - - var baseURL = getFirebugURL(); - - consoleFrame = document.createElement("iframe"); - consoleFrame.setAttribute("src", baseURL+"/firebug.html"); - consoleFrame.setAttribute("frameBorder", "0"); - consoleFrame.style.visibility = (frameVisible ? "visible" : "hidden"); - consoleFrame.style.zIndex = "2147483647"; - consoleFrame.style.position = "fixed"; - consoleFrame.style.width = "100%"; - consoleFrame.style.left = "0"; - consoleFrame.style.bottom = "0"; - consoleFrame.style.height = "200px"; - document.body.appendChild(consoleFrame); - } - - function getFirebugURL() - { - var scripts = document.getElementsByTagName("script"); - for (var i = 0; i < scripts.length; ++i) - { - if (scripts[i].src.indexOf("firebug.js") != -1) - { - var lastSlash = scripts[i].src.lastIndexOf("/"); - return scripts[i].src.substr(0, lastSlash); - } - } - } - - function evalCommandLine() - { - var text = commandLine.value; - commandLine.value = ""; - - logRow([clPrefix, text], "command"); - - var value; - try - { - value = eval(text); - } - catch (exc) - { - } - - console.log(value); - } - - function layout() - { - var toolbar = consoleBody.ownerDocument.getElementById("toolbar"); - var height = consoleFrame.offsetHeight - (toolbar.offsetHeight + commandLine.offsetHeight); - consoleBody.style.top = toolbar.offsetHeight + "px"; - consoleBody.style.height = height + "px"; - - commandLine.style.top = (consoleFrame.offsetHeight - commandLine.offsetHeight) + "px"; - } - - function logRow(message, className, handler) - { - if (consoleBody) - writeMessage(message, className, handler); - else - { - messageQueue.push([message, className, handler]); - waitForBody(); - } - } - - function flush() - { - var queue = messageQueue; - messageQueue = []; - - for (var i = 0; i < queue.length; ++i) - writeMessage(queue[i][0], queue[i][1], queue[i][2]); - } - - function writeMessage(message, className, handler) - { - var isScrolledToBottom = - consoleBody.scrollTop + consoleBody.offsetHeight >= consoleBody.scrollHeight; - - if (!handler) - handler = writeRow; - - handler(message, className); - - if (isScrolledToBottom) - consoleBody.scrollTop = consoleBody.scrollHeight - consoleBody.offsetHeight; - } - - function appendRow(row) - { - var container = groupStack.length ? groupStack[groupStack.length-1] : consoleBody; - container.appendChild(row); - } - - function writeRow(message, className) - { - var row = consoleBody.ownerDocument.createElement("div"); - row.className = "logRow" + (className ? " logRow-"+className : ""); - row.innerHTML = message.join(""); - appendRow(row); - } - - function pushGroup(message, className) - { - logFormatted(message, className); - - var groupRow = consoleBody.ownerDocument.createElement("div"); - groupRow.className = "logGroup"; - var groupRowBox = consoleBody.ownerDocument.createElement("div"); - groupRowBox.className = "logGroupBox"; - groupRow.appendChild(groupRowBox); - appendRow(groupRowBox); - groupStack.push(groupRowBox); - } - - function popGroup() - { - groupStack.pop(); - } - - // ******************************************************************************************** - - function logFormatted(objects, className) - { - var html = []; - - var format = objects[0]; - var objIndex = 0; - - if (typeof(format) != "string") - { - format = ""; - objIndex = -1; - } - - var parts = parseFormat(format); - for (var i = 0; i < parts.length; ++i) - { - var part = parts[i]; - if (part && typeof(part) == "object") - { - var object = objects[++objIndex]; - part.appender(object, html); - } - else - appendText(part, html); - } - - for (var i = objIndex+1; i < objects.length; ++i) - { - appendText(" ", html); - - var object = objects[i]; - if (typeof(object) == "string") - appendText(object, html); - else - appendObject(object, html); - } - - logRow(html, className); - } - - function parseFormat(format) - { - var parts = []; - - var reg = /((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/; - var appenderMap = {s: appendText, d: appendInteger, i: appendInteger, f: appendFloat}; - - for (var m = reg.exec(format); m; m = reg.exec(format)) - { - var type = m[8] ? m[8] : m[5]; - var appender = type in appenderMap ? appenderMap[type] : appendObject; - var precision = m[3] ? parseInt(m[3]) : (m[4] == "." ? -1 : 0); - - parts.push(format.substr(0, m[0][0] == "%" ? m.index : m.index+1)); - parts.push({appender: appender, precision: precision}); - - format = format.substr(m.index+m[0].length); - } - - parts.push(format); - - return parts; - } - - function escapeHTML(value) - { - function replaceChars(ch) - { - switch (ch) - { - case "<": - return "<"; - case ">": - return ">"; - case "&": - return "&"; - case "'": - return "'"; - case '"': - return """; - } - return "?"; - }; - return String(value).replace(/[<>&"']/g, replaceChars); - } - - function objectToString(object) - { - try - { - return object+""; - } - catch (exc) - { - return null; - } - } - - // ******************************************************************************************** - - function appendText(object, html) - { - html.push(escapeHTML(objectToString(object))); - } - - function appendNull(object, html) - { - html.push('', escapeHTML(objectToString(object)), ''); - } - - function appendString(object, html) - { - html.push('"', escapeHTML(objectToString(object)), - '"'); - } - - function appendInteger(object, html) - { - html.push('', escapeHTML(objectToString(object)), ''); - } - - function appendFloat(object, html) - { - html.push('', escapeHTML(objectToString(object)), ''); - } - - function appendFunction(object, html) - { - var reName = /function ?(.*?)\(/; - var m = reName.exec(objectToString(object)); - var name = m ? m[1] : "function"; - html.push('', escapeHTML(name), '()'); - } - - function appendObject(object, html) - { - try - { - if (object == undefined) - appendNull("undefined", html); - else if (object == null) - appendNull("null", html); - else if (typeof object == "string") - appendString(object, html); - else if (typeof object == "number") - appendInteger(object, html); - else if (typeof object == "function") - appendFunction(object, html); - else if (object.nodeType == 1) - appendSelector(object, html); - else if (typeof object == "object") - appendObjectFormatted(object, html); - else - appendText(object, html); - } - catch (exc) - { - } - } - - function appendObjectFormatted(object, html) - { - var text = objectToString(object); - var reObject = /\[object (.*?)\]/; - - var m = reObject.exec(text); - html.push('', m ? m[1] : text, '') - } - - function appendSelector(object, html) - { - html.push(''); - - html.push('', escapeHTML(object.nodeName.toLowerCase()), ''); - if (object.id) - html.push('#', escapeHTML(object.id), ''); - if (object.className) - html.push('.', escapeHTML(object.className), ''); - - html.push(''); - } - - function appendNode(node, html) - { - if (node.nodeType == 1) - { - html.push( - '
    ', - '<', node.nodeName.toLowerCase(), ''); - - for (var i = 0; i < node.attributes.length; ++i) - { - var attr = node.attributes[i]; - if (!attr.specified) - continue; - - html.push(' ', attr.nodeName.toLowerCase(), - '="', escapeHTML(attr.nodeValue), - '"') - } - - if (node.firstChild) - { - html.push('>
    '); - - for (var child = node.firstChild; child; child = child.nextSibling) - appendNode(child, html); - - html.push('
    </', - node.nodeName.toLowerCase(), '>
    '); - } - else - html.push('/>
    '); - } - else if (node.nodeType == 3) - { - html.push('
    ', escapeHTML(node.nodeValue), - '
    '); - } - } - - // ******************************************************************************************** - - function addEvent(object, name, handler) - { - if (document.all) - object.attachEvent("on"+name, handler); - else - object.addEventListener(name, handler, false); - } - - function removeEvent(object, name, handler) - { - if (document.all) - object.detachEvent("on"+name, handler); - else - object.removeEventListener(name, handler, false); - } - - function cancelEvent(event) - { - if (document.all) - event.cancelBubble = true; - else - event.stopPropagation(); - } - - function onError(msg, href, lineNo) - { - var html = []; - - var lastSlash = href.lastIndexOf("/"); - var fileName = lastSlash == -1 ? href : href.substr(lastSlash+1); - - html.push( - '', msg, '', - '
    ', fileName, ' (line ', lineNo, ')
    ' - ); - - logRow(html, "error"); - }; - - function onKeyDown(event) - { - if (event.keyCode == 123) - toggleConsole(); - else if ((event.keyCode == 108 || event.keyCode == 76) && event.shiftKey - && (event.metaKey || event.ctrlKey)) - focusCommandLine(); - else - return; - - cancelEvent(event); - } - - function onSplitterMouseDown(event) - { - if (isSafari || isOpera) - return; - - addEvent(document, "mousemove", onSplitterMouseMove); - addEvent(document, "mouseup", onSplitterMouseUp); - - for (var i = 0; i < frames.length; ++i) - { - addEvent(frames[i].document, "mousemove", onSplitterMouseMove); - addEvent(frames[i].document, "mouseup", onSplitterMouseUp); - } - } - - function onSplitterMouseMove(event) - { - var win = document.all - ? event.srcElement.ownerDocument.parentWindow - : event.target.ownerDocument.defaultView; - - var clientY = event.clientY; - if (win != win.parent) - clientY += win.frameElement ? win.frameElement.offsetTop : 0; - - var height = consoleFrame.offsetTop + consoleFrame.clientHeight; - var y = height - clientY; - - consoleFrame.style.height = y + "px"; - layout(); - } - - function onSplitterMouseUp(event) - { - removeEvent(document, "mousemove", onSplitterMouseMove); - removeEvent(document, "mouseup", onSplitterMouseUp); - - for (var i = 0; i < frames.length; ++i) - { - removeEvent(frames[i].document, "mousemove", onSplitterMouseMove); - removeEvent(frames[i].document, "mouseup", onSplitterMouseUp); - } - } - - function onCommandLineKeyDown(event) - { - if (event.keyCode == 13) - evalCommandLine(); - else if (event.keyCode == 27) - commandLine.value = ""; - } - - window.onerror = onError; - addEvent(document, isIE || isSafari ? "keydown" : "keypress", onKeyDown); - - if (document.documentElement.getAttribute("debug") == "true") - toggleConsole(true); -})(); -} + +if (!("console" in window) || !("firebug" in console)) { +(function() +{ + window.console = + { + log: function() + { + logFormatted(arguments, ""); + }, + + debug: function() + { + logFormatted(arguments, "debug"); + }, + + info: function() + { + logFormatted(arguments, "info"); + }, + + warn: function() + { + logFormatted(arguments, "warning"); + }, + + error: function() + { + logFormatted(arguments, "error"); + }, + + assert: function(truth, message) + { + if (!truth) + { + var args = []; + for (var i = 1; i < arguments.length; ++i) + args.push(arguments[i]); + + logFormatted(args.length ? args : ["Assertion Failure"], "error"); + throw message ? message : "Assertion Failure"; + } + }, + + dir: function(object) + { + var html = []; + + var pairs = []; + for (var name in object) + { + try + { + pairs.push([name, object[name]]); + } + catch (exc) + { + } + } + + pairs.sort(function(a, b) { return a[0] < b[0] ? -1 : 1; }); + + html.push(''); + for (var i = 0; i < pairs.length; ++i) + { + var name = pairs[i][0], value = pairs[i][1]; + + html.push('', + '', ''); + } + html.push('
    ', + escapeHTML(name), ''); + appendObject(value, html); + html.push('
    '); + + logRow(html, "dir"); + }, + + dirxml: function(node) + { + var html = []; + + appendNode(node, html); + logRow(html, "dirxml"); + }, + + group: function() + { + logRow(arguments, "group", pushGroup); + }, + + groupEnd: function() + { + logRow(arguments, "", popGroup); + }, + + time: function(name) + { + timeMap[name] = (new Date()).getTime(); + }, + + timeEnd: function(name) + { + if (name in timeMap) + { + var delta = (new Date()).getTime() - timeMap[name]; + logFormatted([name+ ":", delta+"ms"]); + delete timeMap[name]; + } + }, + + count: function() + { + this.warn(["count() not supported."]); + }, + + trace: function() + { + this.warn(["trace() not supported."]); + }, + + profile: function() + { + this.warn(["profile() not supported."]); + }, + + profileEnd: function() + { + }, + + clear: function() + { + consoleBody.innerHTML = ""; + }, + + open: function() + { + toggleConsole(true); + }, + + close: function() + { + if (frameVisible) + toggleConsole(); + } + }; + + // ******************************************************************************************** + + var consoleFrame = null; + var consoleBody = null; + var commandLine = null; + + var frameVisible = false; + var messageQueue = []; + var groupStack = []; + var timeMap = {}; + + var clPrefix = ">>> "; + + var isFirefox = navigator.userAgent.indexOf("Firefox") != -1; + var isIE = navigator.userAgent.indexOf("MSIE") != -1; + var isOpera = navigator.userAgent.indexOf("Opera") != -1; + var isSafari = navigator.userAgent.indexOf("AppleWebKit") != -1; + + // ******************************************************************************************** + + function toggleConsole(forceOpen) + { + frameVisible = forceOpen || !frameVisible; + if (consoleFrame) + consoleFrame.style.visibility = frameVisible ? "visible" : "hidden"; + else + waitForBody(); + } + + function focusCommandLine() + { + toggleConsole(true); + if (commandLine) + commandLine.focus(); + } + + function waitForBody() + { + if (document.body) + createFrame(); + else + setTimeout(waitForBody, 200); + } + + function createFrame() + { + if (consoleFrame) + return; + + window.onFirebugReady = function(doc) + { + window.onFirebugReady = null; + + var toolbar = doc.getElementById("toolbar"); + toolbar.onmousedown = onSplitterMouseDown; + + commandLine = doc.getElementById("commandLine"); + addEvent(commandLine, "keydown", onCommandLineKeyDown); + + addEvent(doc, isIE || isSafari ? "keydown" : "keypress", onKeyDown); + + consoleBody = doc.getElementById("log"); + layout(); + flush(); + } + + var baseURL = getFirebugURL(); + + consoleFrame = document.createElement("iframe"); + consoleFrame.setAttribute("src", baseURL+"/firebug.html"); + consoleFrame.setAttribute("frameBorder", "0"); + consoleFrame.style.visibility = (frameVisible ? "visible" : "hidden"); + consoleFrame.style.zIndex = "2147483647"; + consoleFrame.style.position = "fixed"; + consoleFrame.style.width = "100%"; + consoleFrame.style.left = "0"; + consoleFrame.style.bottom = "0"; + consoleFrame.style.height = "200px"; + document.body.appendChild(consoleFrame); + } + + function getFirebugURL() + { + var scripts = document.getElementsByTagName("script"); + for (var i = 0; i < scripts.length; ++i) + { + if (scripts[i].src.indexOf("firebug.js") != -1) + { + var lastSlash = scripts[i].src.lastIndexOf("/"); + return scripts[i].src.substr(0, lastSlash); + } + } + } + + function evalCommandLine() + { + var text = commandLine.value; + commandLine.value = ""; + + logRow([clPrefix, text], "command"); + + var value; + try + { + value = eval(text); + } + catch (exc) + { + } + + console.log(value); + } + + function layout() + { + var toolbar = consoleBody.ownerDocument.getElementById("toolbar"); + var height = consoleFrame.offsetHeight - (toolbar.offsetHeight + commandLine.offsetHeight); + consoleBody.style.top = toolbar.offsetHeight + "px"; + consoleBody.style.height = height + "px"; + + commandLine.style.top = (consoleFrame.offsetHeight - commandLine.offsetHeight) + "px"; + } + + function logRow(message, className, handler) + { + if (consoleBody) + writeMessage(message, className, handler); + else + { + messageQueue.push([message, className, handler]); + waitForBody(); + } + } + + function flush() + { + var queue = messageQueue; + messageQueue = []; + + for (var i = 0; i < queue.length; ++i) + writeMessage(queue[i][0], queue[i][1], queue[i][2]); + } + + function writeMessage(message, className, handler) + { + var isScrolledToBottom = + consoleBody.scrollTop + consoleBody.offsetHeight >= consoleBody.scrollHeight; + + if (!handler) + handler = writeRow; + + handler(message, className); + + if (isScrolledToBottom) + consoleBody.scrollTop = consoleBody.scrollHeight - consoleBody.offsetHeight; + } + + function appendRow(row) + { + var container = groupStack.length ? groupStack[groupStack.length-1] : consoleBody; + container.appendChild(row); + } + + function writeRow(message, className) + { + var row = consoleBody.ownerDocument.createElement("div"); + row.className = "logRow" + (className ? " logRow-"+className : ""); + row.innerHTML = message.join(""); + appendRow(row); + } + + function pushGroup(message, className) + { + logFormatted(message, className); + + var groupRow = consoleBody.ownerDocument.createElement("div"); + groupRow.className = "logGroup"; + var groupRowBox = consoleBody.ownerDocument.createElement("div"); + groupRowBox.className = "logGroupBox"; + groupRow.appendChild(groupRowBox); + appendRow(groupRowBox); + groupStack.push(groupRowBox); + } + + function popGroup() + { + groupStack.pop(); + } + + // ******************************************************************************************** + + function logFormatted(objects, className) + { + var html = []; + + var format = objects[0]; + var objIndex = 0; + + if (typeof(format) != "string") + { + format = ""; + objIndex = -1; + } + + var parts = parseFormat(format); + for (var i = 0; i < parts.length; ++i) + { + var part = parts[i]; + if (part && typeof(part) == "object") + { + var object = objects[++objIndex]; + part.appender(object, html); + } + else + appendText(part, html); + } + + for (var i = objIndex+1; i < objects.length; ++i) + { + appendText(" ", html); + + var object = objects[i]; + if (typeof(object) == "string") + appendText(object, html); + else + appendObject(object, html); + } + + logRow(html, className); + } + + function parseFormat(format) + { + var parts = []; + + var reg = /((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/; + var appenderMap = {s: appendText, d: appendInteger, i: appendInteger, f: appendFloat}; + + for (var m = reg.exec(format); m; m = reg.exec(format)) + { + var type = m[8] ? m[8] : m[5]; + var appender = type in appenderMap ? appenderMap[type] : appendObject; + var precision = m[3] ? parseInt(m[3]) : (m[4] == "." ? -1 : 0); + + parts.push(format.substr(0, m[0][0] == "%" ? m.index : m.index+1)); + parts.push({appender: appender, precision: precision}); + + format = format.substr(m.index+m[0].length); + } + + parts.push(format); + + return parts; + } + + function escapeHTML(value) + { + function replaceChars(ch) + { + switch (ch) + { + case "<": + return "<"; + case ">": + return ">"; + case "&": + return "&"; + case "'": + return "'"; + case '"': + return """; + } + return "?"; + }; + return String(value).replace(/[<>&"']/g, replaceChars); + } + + function objectToString(object) + { + try + { + return object+""; + } + catch (exc) + { + return null; + } + } + + // ******************************************************************************************** + + function appendText(object, html) + { + html.push(escapeHTML(objectToString(object))); + } + + function appendNull(object, html) + { + html.push('', escapeHTML(objectToString(object)), ''); + } + + function appendString(object, html) + { + html.push('"', escapeHTML(objectToString(object)), + '"'); + } + + function appendInteger(object, html) + { + html.push('', escapeHTML(objectToString(object)), ''); + } + + function appendFloat(object, html) + { + html.push('', escapeHTML(objectToString(object)), ''); + } + + function appendFunction(object, html) + { + var reName = /function ?(.*?)\(/; + var m = reName.exec(objectToString(object)); + var name = m ? m[1] : "function"; + html.push('', escapeHTML(name), '()'); + } + + function appendObject(object, html) + { + try + { + if (object == undefined) + appendNull("undefined", html); + else if (object == null) + appendNull("null", html); + else if (typeof object == "string") + appendString(object, html); + else if (typeof object == "number") + appendInteger(object, html); + else if (typeof object == "function") + appendFunction(object, html); + else if (object.nodeType == 1) + appendSelector(object, html); + else if (typeof object == "object") + appendObjectFormatted(object, html); + else + appendText(object, html); + } + catch (exc) + { + } + } + + function appendObjectFormatted(object, html) + { + var text = objectToString(object); + var reObject = /\[object (.*?)\]/; + + var m = reObject.exec(text); + html.push('', m ? m[1] : text, '') + } + + function appendSelector(object, html) + { + html.push(''); + + html.push('', escapeHTML(object.nodeName.toLowerCase()), ''); + if (object.id) + html.push('#', escapeHTML(object.id), ''); + if (object.className) + html.push('.', escapeHTML(object.className), ''); + + html.push(''); + } + + function appendNode(node, html) + { + if (node.nodeType == 1) + { + html.push( + '
    ', + '<', node.nodeName.toLowerCase(), ''); + + for (var i = 0; i < node.attributes.length; ++i) + { + var attr = node.attributes[i]; + if (!attr.specified) + continue; + + html.push(' ', attr.nodeName.toLowerCase(), + '="', escapeHTML(attr.nodeValue), + '"') + } + + if (node.firstChild) + { + html.push('>
    '); + + for (var child = node.firstChild; child; child = child.nextSibling) + appendNode(child, html); + + html.push('
    </', + node.nodeName.toLowerCase(), '>
    '); + } + else + html.push('/>'); + } + else if (node.nodeType == 3) + { + html.push('
    ', escapeHTML(node.nodeValue), + '
    '); + } + } + + // ******************************************************************************************** + + function addEvent(object, name, handler) + { + if (document.all) + object.attachEvent("on"+name, handler); + else + object.addEventListener(name, handler, false); + } + + function removeEvent(object, name, handler) + { + if (document.all) + object.detachEvent("on"+name, handler); + else + object.removeEventListener(name, handler, false); + } + + function cancelEvent(event) + { + if (document.all) + event.cancelBubble = true; + else + event.stopPropagation(); + } + + function onError(msg, href, lineNo) + { + var html = []; + + var lastSlash = href.lastIndexOf("/"); + var fileName = lastSlash == -1 ? href : href.substr(lastSlash+1); + + html.push( + '', msg, '', + '
    ', fileName, ' (line ', lineNo, ')
    ' + ); + + logRow(html, "error"); + }; + + function onKeyDown(event) + { + if (event.keyCode == 123) + toggleConsole(); + else if ((event.keyCode == 108 || event.keyCode == 76) && event.shiftKey + && (event.metaKey || event.ctrlKey)) + focusCommandLine(); + else + return; + + cancelEvent(event); + } + + function onSplitterMouseDown(event) + { + if (isSafari || isOpera) + return; + + addEvent(document, "mousemove", onSplitterMouseMove); + addEvent(document, "mouseup", onSplitterMouseUp); + + for (var i = 0; i < frames.length; ++i) + { + addEvent(frames[i].document, "mousemove", onSplitterMouseMove); + addEvent(frames[i].document, "mouseup", onSplitterMouseUp); + } + } + + function onSplitterMouseMove(event) + { + var win = document.all + ? event.srcElement.ownerDocument.parentWindow + : event.target.ownerDocument.defaultView; + + var clientY = event.clientY; + if (win != win.parent) + clientY += win.frameElement ? win.frameElement.offsetTop : 0; + + var height = consoleFrame.offsetTop + consoleFrame.clientHeight; + var y = height - clientY; + + consoleFrame.style.height = y + "px"; + layout(); + } + + function onSplitterMouseUp(event) + { + removeEvent(document, "mousemove", onSplitterMouseMove); + removeEvent(document, "mouseup", onSplitterMouseUp); + + for (var i = 0; i < frames.length; ++i) + { + removeEvent(frames[i].document, "mousemove", onSplitterMouseMove); + removeEvent(frames[i].document, "mouseup", onSplitterMouseUp); + } + } + + function onCommandLineKeyDown(event) + { + if (event.keyCode == 13) + evalCommandLine(); + else if (event.keyCode == 27) + commandLine.value = ""; + } + + window.onerror = onError; + addEvent(document, isIE || isSafari ? "keydown" : "keypress", onKeyDown); + + if (document.documentElement.getAttribute("debug") == "true") + toggleConsole(true); +})(); +} diff --git a/test/firebug/firebugx.js b/test/firebug/firebugx.js index 7d3c85d66..5a467fc14 100644 --- a/test/firebug/firebugx.js +++ b/test/firebug/firebugx.js @@ -1,10 +1,10 @@ - -if (!("console" in window) || !("firebug" in console)) -{ - var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", - "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; - - window.console = {}; - for (var i = 0; i < names.length; ++i) - window.console[names[i]] = function() {} + +if (!("console" in window) || !("firebug" in console)) +{ + var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", + "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; + + window.console = {}; + for (var i = 0; i < names.length; ++i) + window.console[names[i]] = function() {} } \ No newline at end of file diff --git a/test/index-14.html b/test/index-14.html index d4a5cb4aa..b8ee2f18e 100644 --- a/test/index-14.html +++ b/test/index-14.html @@ -1,9 +1,9 @@ - + jQuery - Validation Test Suite - + @@ -116,22 +116,22 @@

    - -
    + + - +
    -
    - -
    -

    + + +
    +

    - -
    - + +
    +
      @@ -143,17 +143,17 @@

      -
      - -
      +
      + +
      - - - - + + + + @@ -223,8 +223,8 @@

      - - + +
      @@ -255,7 +255,7 @@

      -
        - +
          + diff --git a/test/index.html b/test/index.html index fc7045088..d2a1ccb56 100644 --- a/test/index.html +++ b/test/index.html @@ -1,9 +1,9 @@ - + jQuery - Validation Test Suite - + @@ -116,22 +116,22 @@

          - -
          + + - +
          -
          - -
          -

          + + +
          +

          - -
          - + +
          +
            @@ -143,17 +143,17 @@

            -
            - -
            +
            + +
            - - - - + + + + @@ -223,8 +223,8 @@

            - - + +
            @@ -255,7 +255,7 @@

            -
              - +
                + diff --git a/test/large.html b/test/large.html index fd22cacb1..82c47f1f8 100644 --- a/test/large.html +++ b/test/large.html @@ -9,39 +9,39 @@ - - - - - +
                - A simple comment form with submit validation and default messages -

                - + A simple comment form with submit validation and default messages +

                +

                -

                -

                - - -

                -

                - - +

                +

                + + +

                +

                + +

                diff --git a/test/messages.js b/test/messages.js index cb4a1485d..0faf984ed 100644 --- a/test/messages.js +++ b/test/messages.js @@ -1,62 +1,62 @@ -module("messages"); - -test("predefined message not overwritten by addMethod(a, b, undefined)", function() { - var message = "my custom message"; - $.validator.messages.custom = message; - $.validator.addMethod("custom", function() {}); - same(message, $.validator.messages.custom); - delete $.validator.messages.custom; - delete $.validator.methods.custom; -}); - -test("group error messages", function() { - $.validator.addClassRules({ - requiredDateRange: {required:true, date:true, dateRange:true} - }); - $.validator.addMethod("dateRange", function() { - return new Date($("#fromDate").val()) < new Date($("#toDate").val()); - }, "Please specify a correct date range."); - var form = $("#dateRangeForm"); - form.validate({ - groups: { - dateRange: "fromDate toDate" - }, - errorPlacement: function(error) { - form.find(".errorContainer").append(error); - } - }); - ok( !form.valid() ); - equals( 1, form.find(".errorContainer *").length ); - equals( "Please enter a valid date.", form.find(".errorContainer label.error").text() ); - - $("#fromDate").val("12/03/2006"); - $("#toDate").val("12/01/2006"); - ok( !form.valid() ); - equals( "Please specify a correct date range.", form.find(".errorContainer label.error").text() ); - - $("#toDate").val("12/04/2006"); - ok( form.valid() ); - ok( form.find(".errorContainer label.error").is(":hidden") ); -}); - -test("read messages from metadata", function() { - var form = $("#testForm9") - form.validate(); - var e = $("#testEmail9") - e.valid(); - equals( form.find("label").text(), "required" ); - e.val("bla").valid(); - equals( form.find("label").text(), "email" ); -}); - - -test("read messages from metadata, with meta option specified, but no metadata in there", function() { - var form = $("#testForm1clean") - form.validate({ - meta: "validate", - rules: { - firstname: "required" - } - }); - ok(!form.valid(), "not valid"); +module("messages"); + +test("predefined message not overwritten by addMethod(a, b, undefined)", function() { + var message = "my custom message"; + $.validator.messages.custom = message; + $.validator.addMethod("custom", function() {}); + same(message, $.validator.messages.custom); + delete $.validator.messages.custom; + delete $.validator.methods.custom; +}); + +test("group error messages", function() { + $.validator.addClassRules({ + requiredDateRange: {required:true, date:true, dateRange:true} + }); + $.validator.addMethod("dateRange", function() { + return new Date($("#fromDate").val()) < new Date($("#toDate").val()); + }, "Please specify a correct date range."); + var form = $("#dateRangeForm"); + form.validate({ + groups: { + dateRange: "fromDate toDate" + }, + errorPlacement: function(error) { + form.find(".errorContainer").append(error); + } + }); + ok( !form.valid() ); + equals( 1, form.find(".errorContainer *").length ); + equals( "Please enter a valid date.", form.find(".errorContainer label.error").text() ); + + $("#fromDate").val("12/03/2006"); + $("#toDate").val("12/01/2006"); + ok( !form.valid() ); + equals( "Please specify a correct date range.", form.find(".errorContainer label.error").text() ); + + $("#toDate").val("12/04/2006"); + ok( form.valid() ); + ok( form.find(".errorContainer label.error").is(":hidden") ); +}); + +test("read messages from metadata", function() { + var form = $("#testForm9") + form.validate(); + var e = $("#testEmail9") + e.valid(); + equals( form.find("label").text(), "required" ); + e.val("bla").valid(); + equals( form.find("label").text(), "email" ); +}); + + +test("read messages from metadata, with meta option specified, but no metadata in there", function() { + var form = $("#testForm1clean") + form.validate({ + meta: "validate", + rules: { + firstname: "required" + } + }); + ok(!form.valid(), "not valid"); }); \ No newline at end of file diff --git a/test/methods.js b/test/methods.js index 235124ae8..15ce32509 100644 --- a/test/methods.js +++ b/test/methods.js @@ -1,584 +1,584 @@ -(function($) { - -function methodTest( methodName ) { - var v = jQuery("#form").validate(); - var method = $.validator.methods[methodName]; - var element = $("#firstname")[0]; - return function(value, param) { - element.value = value; - return method.call( v, value, element, param ); - }; -} - -module("methods"); - -test("default messages", function() { - var m = $.validator.methods; - $.each(m, function(key) { - ok( jQuery.validator.messages[key], key + " has a default message." ); - }); -}); - -test("digit", function() { - var method = methodTest("digits"); - ok( method( "123" ), "Valid digits" ); - ok(!method( "123.000" ), "Invalid digits" ); - ok(!method( "123.000,00" ), "Invalid digits" ); - ok(!method( "123.0.0,0" ), "Invalid digits" ); - ok(!method( "x123" ), "Invalid digits" ); - ok(!method( "100.100,0,0" ), "Invalid digits" ); -}); - -test("url", function() { - var method = methodTest("url"); - ok( method( "http://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "https://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "ftp://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" ); - ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" ); - ok( method( "http://192.168.8.5" ), "Valid IP Address" ) - ok(!method( "http://192.168.8." ), "Invalid IP Address" ) - ok(!method( "http://bassistance" ), "Invalid url" ); // valid - ok(!method( "http://bassistance." ), "Invalid url" ); // valid - ok(!method( "http://bassistance,de" ), "Invalid url" ); - ok(!method( "http://bassistance;de" ), "Invalid url" ); - ok(!method( "http://.bassistancede" ), "Invalid url" ); - ok(!method( "bassistance.de" ), "Invalid url" ); -}); - -test("url2 (tld optional)", function() { - var method = methodTest("url2"); - ok( method( "http://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "https://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "ftp://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); - ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" ); - ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" ); - ok( method( "http://192.168.8.5" ), "Valid IP Address" ) - ok(!method( "http://192.168.8." ), "Invalid IP Address" ) - ok( method( "http://bassistance" ), "Invalid url" ); - ok( method( "http://bassistance." ), "Invalid url" ); - ok(!method( "http://bassistance,de" ), "Invalid url" ); - ok(!method( "http://bassistance;de" ), "Invalid url" ); - ok(!method( "http://.bassistancede" ), "Invalid url" ); - ok(!method( "bassistance.de" ), "Invalid url" ); -}); - -test("email", function() { - var method = methodTest("email"); - ok( method( "name@domain.tld" ), "Valid email" ); - ok( method( "name@domain.tl" ), "Valid email" ); - ok( method( "bart+bart@tokbox.com" ), "Valid email" ); - ok( method( "bart+bart@tokbox.travel" ), "Valid email" ); - ok( method( "n@d.tld" ), "Valid email" ); - ok( method( "ole@føtex.dk"), "Valid email" ); - ok( method( "jörn@bassistance.de"), "Valid email" ); - ok( method( "bla.blu@g.mail.com"), "Valid email" ); - ok( method( "\"Scott Gonzalez\"@example.com" ), "Valid email" ); - ok( method( "\"Scott González\"@example.com" ), "Valid email" ); - ok( method( "\"name.\"@domain.tld" ), "Valid email" ); // valid without top label - ok( method( "\"name,\"@domain.tld" ), "Valid email" ); // valid without top label - ok( method( "\"name;\"@domain.tld" ), "Valid email" ); // valid without top label - ok(!method( "name" ), "Invalid email" ); - ok(!method( "name@" ), "Invalid email" ); - ok(!method( "name@domain" ), "Invalid email" ); - ok(!method( "name.@domain.tld" ), "Invalid email" ); - ok(!method( "name,@domain.tld" ), "Invalid email" ); - ok(!method( "name;@domain.tld" ), "Invalid email" ); -}); - -test("email2 (tld optional)", function() { - var method = methodTest("email2"); - ok( method( "name@domain.tld" ), "Valid email" ); - ok( method( "name@domain.tl" ), "Valid email" ); - ok( method( "bart+bart@tokbox.com" ), "Valid email" ); - ok( method( "bart+bart@tokbox.travel" ), "Valid email" ); - ok( method( "n@d.tld" ), "Valid email" ); - ok( method( "ole@føtex.dk"), "Valid email" ); - ok( method( "jörn@bassistance.de"), "Valid email" ); - ok( method( "bla.blu@g.mail.com"), "Valid email" ); - ok( method( "\"Scott Gonzalez\"@example.com" ), "Valid email" ); - ok( method( "\"Scott González\"@example.com" ), "Valid email" ); - ok( method( "\"name.\"@domain.tld" ), "Valid email" ); // valid without top label - ok( method( "\"name,\"@domain.tld" ), "Valid email" ); // valid without top label - ok( method( "\"name;\"@domain.tld" ), "Valid email" ); // valid without top label - ok(!method( "name" ), "Invalid email" ); - ok(!method( "name@" ), "Invalid email" ); - ok( method( "name@domain" ), "Invalid email" ); - ok(!method( "name.@domain.tld" ), "Invalid email" ); - ok(!method( "name,@domain.tld" ), "Invalid email" ); - ok(!method( "name;@domain.tld" ), "Invalid email" ); -}); - -test("number", function() { - var method = methodTest("number"); - ok( method( "123" ), "Valid number" ); - ok( method( "-123" ), "Valid number" ); - ok( method( "123,000" ), "Valid number" ); - ok( method( "-123,000" ), "Valid number" ); - ok( method( "123,000.00" ), "Valid number" ); - ok( method( "-123,000.00" ), "Valid number" ); - ok(!method( "123.000,00" ), "Invalid number" ); - ok(!method( "123.0.0,0" ), "Invalid number" ); - ok(!method( "x123" ), "Invalid number" ); - ok(!method( "100.100,0,0" ), "Invalid number" ); - - ok( method( "" ), "Blank is valid" ); - ok( method( "123" ), "Valid decimal" ); - ok( method( "123000" ), "Valid decimal" ); - ok( method( "123000.12" ), "Valid decimal" ); - ok( method( "-123000.12" ), "Valid decimal" ); - ok( method( "123.000" ), "Valid decimal" ); - ok( method( "123,000.00" ), "Valid decimal" ); - ok( method( "-123,000.00" ), "Valid decimal" ); - ok(!method( "1230,000.00" ), "Invalid decimal" ); - ok(!method( "123.0.0,0" ), "Invalid decimal" ); - ok(!method( "x123" ), "Invalid decimal" ); - ok(!method( "100.100,0,0" ), "Invalid decimal" ); -}); - -/* disabled for now, need to figure out how to test localized methods -test("numberDE", function() { - var method = methodTest("numberDE"); - ok( method( "123" ), "Valid numberDE" ); - ok( method( "-123" ), "Valid numberDE" ); - ok( method( "123.000" ), "Valid numberDE" ); - ok( method( "-123.000" ), "Valid numberDE" ); - ok( method( "123.000,00" ), "Valid numberDE" ); - ok( method( "-123.000,00" ), "Valid numberDE" ); - ok(!method( "123,000.00" ), "Invalid numberDE" ); - ok(!method( "123,0,0.0" ), "Invalid numberDE" ); - ok(!method( "x123" ), "Invalid numberDE" ); - ok(!method( "100,100.0.0" ), "Invalid numberDE" ); - - ok( method( "" ), "Blank is valid" ); - ok( method( "123" ), "Valid decimalDE" ); - ok( method( "123000" ), "Valid decimalDE" ); - ok( method( "123000,12" ), "Valid decimalDE" ); - ok( method( "-123000,12" ), "Valid decimalDE" ); - ok( method( "123.000" ), "Valid decimalDE" ); - ok( method( "123.000,00" ), "Valid decimalDE" ); - ok( method( "-123.000,00" ), "Valid decimalDE" ) - ok(!method( "123.0.0,0" ), "Invalid decimalDE" ); - ok(!method( "x123" ), "Invalid decimalDE" ); - ok(!method( "100,100.0.0" ), "Invalid decimalDE" ); -}); -*/ - -test("date", function() { - var method = methodTest("date"); - ok( method( "06/06/1990" ), "Valid date" ); - ok( method( "6/6/06" ), "Valid date" ); - ok(!method( "1990x-06-06" ), "Invalid date" ); -}); - -test("dateISO", function() { - var method = methodTest("dateISO"); - ok( method( "1990-06-06" ), "Valid date" ); - ok( method( "1990/06/06" ), "Valid date" ); - ok( method( "1990-6-6" ), "Valid date" ); - ok( method( "1990/6/6" ), "Valid date" ); - ok(!method( "1990-106-06" ), "Invalid date" ); - ok(!method( "190-06-06" ), "Invalid date" ); -}); - -/* disabled for now, need to figure out how to test localized methods -test("dateDE", function() { - var method = methodTest("dateDE"); - ok( method( "03.06.1984" ), "Valid dateDE" ); - ok( method( "3.6.84" ), "Valid dateDE" ); - ok(!method( "6-6-06" ), "Invalid dateDE" ); - ok(!method( "1990-06-06" ), "Invalid dateDE" ); - ok(!method( "06/06/1990" ), "Invalid dateDE" ); - ok(!method( "6/6/06" ), "Invalid dateDE" ); -}); -*/ - -test("required", function() { - var v = jQuery("#form").validate(), - method = $.validator.methods.required, - e = $('#text1, #text1b, #hidden2, #select1, #select2'); - ok( method.call( v, e[0].value, e[0]), "Valid text input" ); - ok(!method.call( v, e[1].value, e[1]), "Invalid text input" ); - ok(!method.call( v, e[1].value, e[2]), "Invalid text input" ); - - ok(!method.call( v, e[2].value, e[3]), "Invalid select" ); - ok( method.call( v, e[3].value, e[4]), "Valid select" ); - - e = $('#area1, #area2, #pw1, #pw2'); - ok( method.call( v, e[0].value, e[0]), "Valid textarea" ); - ok(!method.call( v, e[1].value, e[1]), "Invalid textarea" ); - ok( method.call( v, e[2].value, e[2]), "Valid password input" ); - ok(!method.call( v, e[3].value, e[3]), "Invalid password input" ); - - e = $('#radio1, #radio2, #radio3'); - ok(!method.call( v, e[0].value, e[0]), "Invalid radio" ); - ok( method.call( v, e[1].value, e[1]), "Valid radio" ); - ok( method.call( v, e[2].value, e[2]), "Valid radio" ); - - e = $('#check1, #check2'); - ok( method.call( v, e[0].value, e[0]), "Valid checkbox" ); - ok(!method.call( v, e[1].value, e[1]), "Invalid checkbox" ); - - e = $('#select1, #select2, #select3, #select4'); - ok(!method.call( v, e[0].value, e[0]), "Invalid select" ); - ok( method.call( v, e[1].value, e[1]), "Valid select" ); - ok( method.call( v, e[2].value, e[2]), "Valid select" ); - ok( method.call( v, e[3].value, e[3]), "Valid select" ); -}); - -test("required with dependencies", function() { - var v = jQuery("#form").validate(), - method = $.validator.methods.required, - e = $('#hidden2, #select1, #area2, #radio1, #check2'); - ok( method.call( v, e[0].value, e[0], "asffsaa"), "Valid text input due to depencie not met" ); - ok(!method.call( v, e[0].value, e[0], "input"), "Invalid text input" ); - ok( method.call( v, e[0].value, e[0], function() { return false; }), "Valid text input due to depencie not met" ); - ok(!method.call( v, e[0].value, e[0], function() { return true; }), "Invalid text input" ); - ok( method.call( v, e[1].value, e[1], "asfsfa"), "Valid select due to dependency not met" ); - ok(!method.call( v, e[1].value, e[1], "input"), "Invalid select" ); - ok( method.call( v, e[2].value, e[2], "asfsafsfa"), "Valid textarea due to dependency not met" ); - ok(!method.call( v, e[2].value, e[2], "input"), "Invalid textarea" ); - ok( method.call( v, e[3].value, e[3], "asfsafsfa"), "Valid radio due to dependency not met" ); - ok(!method.call( v, e[3].value, e[3], "input"), "Invalid radio" ); - ok( method.call( v, e[4].value, e[4], "asfsafsfa"), "Valid checkbox due to dependency not met" ); - ok(!method.call( v, e[4].value, e[4], "input"), "Invalid checkbox" ); -}); - -test("minlength", function() { - var v = jQuery("#form").validate(), - method = $.validator.methods.minlength, - param = 2, - e = $('#text1, #text1c, #text2, #text3'); - ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); - ok(!method.call( v, e[1].value, e[1], param), "Invalid text input" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); - ok( method.call( v, e[3].value, e[3], param), "Valid text input" ); - - e = $('#check1, #check2, #check3'); - ok(!method.call( v, e[0].value, e[0], param), "Valid checkbox" ); - ok( method.call( v, e[1].value, e[1], param), "Valid checkbox" ); - ok( method.call( v, e[2].value, e[2], param), "Invalid checkbox" ); - - e = $('#select1, #select2, #select3, #select4, #select5'); - ok(method.call( v, e[0].value, e[0], param), "Valid select " + e[0].id ); - ok(!method.call( v, e[1].value, e[1], param), "Invalid select " + e[1].id ); - ok( method.call( v, e[2].value, e[2], param), "Valid select " + e[2].id ); - ok( method.call( v, e[3].value, e[3], param), "Valid select " + e[3].id ); - ok( method.call( v, e[4].value, e[4], param), "Valid select " + e[4].id ); -}); - -test("maxlength", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.maxlength, - param = 4, - e = $('#text1, #text2, #text3'); - ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); - ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); - - e = $('#check1, #check2, #check3'); - ok( method.call( v, e[0].value, e[0], param), "Valid checkbox" ); - ok( method.call( v, e[1].value, e[1], param), "Invalid checkbox" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid checkbox" ); - - e = $('#select1, #select2, #select3, #select4'); - ok( method.call( v, e[0].value, e[0], param), "Valid select" ); - ok( method.call( v, e[1].value, e[1], param), "Valid select" ); - ok( method.call( v, e[2].value, e[2], param), "Valid select" ); - ok(!method.call( v, e[3].value, e[3], param), "Invalid select" ); -}); - -test("rangelength", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.rangelength, - param = [2, 4], - e = $('#text1, #text2, #text3'); - ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); - ok(!method.call( v, e[1].value, e[1], param), "Invalid text input" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); -}); - -test("min", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.min, - param = 8, - e = $('#value1, #value2, #value3'); - ok(!method.call( v, e[0].value, e[0], param), "Invalid text input" ); - ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); - ok( method.call( v, e[2].value, e[2], param), "Valid text input" ); -}); - -test("max", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.max, - param = 12, - e = $('#value1, #value2, #value3'); - ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); - ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); -}); - -test("range", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.range, - param = [4,12], - e = $('#value1, #value2, #value3'); - ok(!method.call( v, e[0].value, e[0], param), "Invalid text input" ); - ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); - ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); -}); - -test("equalTo", function() { - var v = jQuery("#form").validate(); - var method = $.validator.methods.equalTo, - e = $('#text1, #text2'); - ok( method.call( v, "Test", e[0], "#text1"), "Text input" ); - ok( method.call( v, "T", e[1], "#text2"), "Another one" ); -}); - -test("creditcard", function() { - var method = methodTest("creditcard"); - ok( method( "446-667-651" ), "Valid creditcard number" ); - ok( !method( "asdf" ), "Invalid creditcard number" ); -}); - -test("accept", function() { - var method = methodTest("accept"); - ok( method( "picture.gif" ), "Valid default accept type" ); - ok( method( "picture.jpg" ), "Valid default accept type" ); - ok( method( "picture.jpeg" ), "Valid default accept type" ); - ok( method( "picture.png" ), "Valid default accept type" ); - ok( !method( "picture.pgn" ), "Invalid default accept type" ); - - var v = jQuery("#form").validate(), - method = function(value, param) { - return $.validator.methods.accept.call(v, value, $('#text1')[0], param) - }; - ok( method( "picture.doc", "doc"), "Valid custom accept type" ); - ok( method( "picture.pdf", "doc|pdf"), "Valid custom accept type" ); - ok( method( "picture.pdf", "pdf|doc"), "Valid custom accept type" ); - ok( !method( "picture.pdf", "doc"), "Invalid custom accept type" ); - ok( !method( "picture.doc", "pdf"), "Invalid custom accept type" ); - - ok( method( "picture.pdf", "doc,pdf"), "Valid custom accept type, comma seperated" ); - ok( method( "picture.pdf", "pdf,doc"), "Valid custom accept type, comma seperated" ); - ok( !method( "picture.pdf", "gop,top"), "Invalid custom accept type, comma seperated" ); -}); - -test("remote", function() { - expect(7); - stop(); - var e = $("#username"); - var v = $("#userForm").validate({ - rules: { - username: { - required: true, - remote: "users.php" - } - }, - messages: { - username: { - required: "Please", - remote: jQuery.validator.format("{0} in use") - } - }, - submitHandler: function() { - ok( false, "submitHandler may never be called when validating only elements"); - } - }); - $(document).ajaxStop(function() { - $(document).unbind("ajaxStop"); - equals( 1, v.size(), "There must be one error" ); - equals( "Peter in use", v.errorList[0].message ); - - $(document).ajaxStop(function() { - $(document).unbind("ajaxStop"); - equals( 1, v.size(), "There must be one error" ); - equals( "Peter2 in use", v.errorList[0].message ); - start(); - }); - e.val("Peter2"); - ok( !v.element(e), "new value, new request" ); - }); - ok( !v.element(e), "invalid element, nothing entered yet" ); - e.val("Peter"); - ok( !v.element(e), "still invalid, because remote validation must block until it returns" ); -}); - -test("remote, customized ajax options", function() { - expect(2); - stop(); - var v = $("#userForm").validate({ - rules: { - username: { - required: true, - remote: { - url: "users.php", - type: "post", - beforeSend: function(request, settings) { - same(settings.type, "post"); - same(settings.data, "username=asdf&email=email.com"); - }, - data: { - email: function() { - return "email.com"; - } - }, - complete: function() { - start(); - } - } - } - } - }); - $("#username").val("asdf"); - $("#userForm").valid(); -}); - - -test("remote extensions", function() { - expect(5); - stop(); - var e = $("#username"); - var v = $("#userForm").validate({ - rules: { - username: { - required: true, - remote: "users2.php" - } - }, - messages: { - username: { - required: "Please" - } - }, - submitHandler: function() { - ok( false, "submitHandler may never be called when validating only elements"); - } - }); - $(document).ajaxStop(function() { - $(document).unbind("ajaxStop"); - equals( 1, v.size(), "There must be one error" ); - equals( v.errorList[0].message, "asdf is already taken, please try something else" ); - v.element(e); - equals( v.errorList[0].message, "asdf is already taken, please try something else", "message doesn't change on revalidation" ); - start(); - }); - ok( !v.element(e), "invalid element, nothing entered yet" ); - e.val("asdf"); - ok( !v.element(e), "still invalid, because remote validation must block until it returns" ); -}); - -module("additional methods"); - -test("phone (us)", function() { - var method = methodTest("phoneUS"); - ok( method( "1(212)-999-2345" ), "Valid us phone number" ); - ok( method( "212 999 2344" ), "Valid us phone number" ); - ok( method( "212-999-0983" ), "Valid us phone number" ); - ok(!method( "111-123-5434" ), "Invalid us phone number" ); - ok(!method( "212 123 4567" ), "Invalid us phone number" ); -}); - -test("dateITA", function() { - var method = methodTest("dateITA"); - ok( method( "01/01/1900" ), "Valid date ITA" ); - ok(!method( "01/13/1990" ), "Invalid date ITA" ); - ok(!method( "01.01.1900" ), "Invalid date ITA" ); -}); - -test("time", function() { - var method = methodTest("time"); - ok( method("00:00"), "Valid time, lower bound" ); - ok( method("23:59"), "Valid time, upper bound" ); - ok( !method("24:60"), "Invalid time" ); - ok( !method("24:00"), "Invalid time" ); - ok( !method("29:59"), "Invalid time" ); - ok( !method("30:00"), "Invalid time" ); -}); - -test("minWords", function() { - var method = methodTest("minWords"); - ok( method("hello worlds", 2), "plain text, valid" ); - ok( method("hello world", 2), "html, valid" ); - ok( !method("hello", 2), "plain text, invalid" ); - ok( !method("world", 2), "html, invalid" ); - ok( !method("world
                ", 2), "html, invalid" ); -}); - -test("maxWords", function() { - var method = methodTest("maxWords"); - ok( method("hello", 2), "plain text, valid" ); - ok( method("world", 2), "html, valid" ); - ok( method("world
                ", 2), "html, valid" ); - ok( !method("hello worlds", 2), "plain text, invalid" ); - ok( !method("hello world", 2), "html, invalid" ); -}); - -function testCardTypeByNumber(number, cardname, expected) { - $("#cardnumber").val(number); - var actual = $("#ccform").valid(); - equals(actual, expected, $.format("Expect card number {0} to validate to {1}, actually validated to ", number, expected)); -} - -test('creditcardtypes, all', function() { - $("#ccform").validate({ - rules: { - cardnumber: { - creditcard: true, - creditcardtypes: { - all: true - } - } - } - }); - - testCardTypeByNumber("4111-1111-1111-1111", "VISA", true) - testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", true) - testCardTypeByNumber("6111-1111-1111-1116", "Discover", true) - testCardTypeByNumber("3400-0000-0000-009", "AMEX", true); - - testCardTypeByNumber("4111-1111-1111-1110", "VISA", false) - testCardTypeByNumber("5432-1111-1111-1111", "MasterCard", false) - testCardTypeByNumber("6611-6611-6611-6611", "Discover", false) - testCardTypeByNumber("3777-7777-7777-7777", "AMEX", false) - -}); - -test('creditcardtypes, visa', function() { - $("#ccform").validate({ - rules: { - cardnumber: { - creditcard: true, - creditcardtypes: { - visa: true - } - } - } - }); - - testCardTypeByNumber("4111-1111-1111-1111", "VISA", true) - testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", false) - testCardTypeByNumber("6111-1111-1111-1116", "Discover", false) - testCardTypeByNumber("3400-0000-0000-009", "AMEX", false); -}); - -test('creditcardtypes, mastercard', function() { - $("#ccform").validate({ - rules: { - cardnumber: { - creditcard: true, - creditcardtypes: { - mastercard: true - } - } - } - }); - - testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", true) - testCardTypeByNumber("6111-1111-1111-1116", "Discover", false) - testCardTypeByNumber("3400-0000-0000-009", "AMEX", false); - testCardTypeByNumber("4111-1111-1111-1111", "VISA", false); -}); - +(function($) { + +function methodTest( methodName ) { + var v = jQuery("#form").validate(); + var method = $.validator.methods[methodName]; + var element = $("#firstname")[0]; + return function(value, param) { + element.value = value; + return method.call( v, value, element, param ); + }; +} + +module("methods"); + +test("default messages", function() { + var m = $.validator.methods; + $.each(m, function(key) { + ok( jQuery.validator.messages[key], key + " has a default message." ); + }); +}); + +test("digit", function() { + var method = methodTest("digits"); + ok( method( "123" ), "Valid digits" ); + ok(!method( "123.000" ), "Invalid digits" ); + ok(!method( "123.000,00" ), "Invalid digits" ); + ok(!method( "123.0.0,0" ), "Invalid digits" ); + ok(!method( "x123" ), "Invalid digits" ); + ok(!method( "100.100,0,0" ), "Invalid digits" ); +}); + +test("url", function() { + var method = methodTest("url"); + ok( method( "http://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "https://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "ftp://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" ); + ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" ); + ok( method( "http://192.168.8.5" ), "Valid IP Address" ) + ok(!method( "http://192.168.8." ), "Invalid IP Address" ) + ok(!method( "http://bassistance" ), "Invalid url" ); // valid + ok(!method( "http://bassistance." ), "Invalid url" ); // valid + ok(!method( "http://bassistance,de" ), "Invalid url" ); + ok(!method( "http://bassistance;de" ), "Invalid url" ); + ok(!method( "http://.bassistancede" ), "Invalid url" ); + ok(!method( "bassistance.de" ), "Invalid url" ); +}); + +test("url2 (tld optional)", function() { + var method = methodTest("url2"); + ok( method( "http://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "https://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "ftp://bassistance.de/jquery/plugin.php?bla=blu" ), "Valid url" ); + ok( method( "http://www.føtex.dk/" ), "Valid url, danish unicode characters" ); + ok( method( "http://bösendorfer.de/" ), "Valid url, german unicode characters" ); + ok( method( "http://192.168.8.5" ), "Valid IP Address" ) + ok(!method( "http://192.168.8." ), "Invalid IP Address" ) + ok( method( "http://bassistance" ), "Invalid url" ); + ok( method( "http://bassistance." ), "Invalid url" ); + ok(!method( "http://bassistance,de" ), "Invalid url" ); + ok(!method( "http://bassistance;de" ), "Invalid url" ); + ok(!method( "http://.bassistancede" ), "Invalid url" ); + ok(!method( "bassistance.de" ), "Invalid url" ); +}); + +test("email", function() { + var method = methodTest("email"); + ok( method( "name@domain.tld" ), "Valid email" ); + ok( method( "name@domain.tl" ), "Valid email" ); + ok( method( "bart+bart@tokbox.com" ), "Valid email" ); + ok( method( "bart+bart@tokbox.travel" ), "Valid email" ); + ok( method( "n@d.tld" ), "Valid email" ); + ok( method( "ole@føtex.dk"), "Valid email" ); + ok( method( "jörn@bassistance.de"), "Valid email" ); + ok( method( "bla.blu@g.mail.com"), "Valid email" ); + ok( method( "\"Scott Gonzalez\"@example.com" ), "Valid email" ); + ok( method( "\"Scott González\"@example.com" ), "Valid email" ); + ok( method( "\"name.\"@domain.tld" ), "Valid email" ); // valid without top label + ok( method( "\"name,\"@domain.tld" ), "Valid email" ); // valid without top label + ok( method( "\"name;\"@domain.tld" ), "Valid email" ); // valid without top label + ok(!method( "name" ), "Invalid email" ); + ok(!method( "name@" ), "Invalid email" ); + ok(!method( "name@domain" ), "Invalid email" ); + ok(!method( "name.@domain.tld" ), "Invalid email" ); + ok(!method( "name,@domain.tld" ), "Invalid email" ); + ok(!method( "name;@domain.tld" ), "Invalid email" ); +}); + +test("email2 (tld optional)", function() { + var method = methodTest("email2"); + ok( method( "name@domain.tld" ), "Valid email" ); + ok( method( "name@domain.tl" ), "Valid email" ); + ok( method( "bart+bart@tokbox.com" ), "Valid email" ); + ok( method( "bart+bart@tokbox.travel" ), "Valid email" ); + ok( method( "n@d.tld" ), "Valid email" ); + ok( method( "ole@føtex.dk"), "Valid email" ); + ok( method( "jörn@bassistance.de"), "Valid email" ); + ok( method( "bla.blu@g.mail.com"), "Valid email" ); + ok( method( "\"Scott Gonzalez\"@example.com" ), "Valid email" ); + ok( method( "\"Scott González\"@example.com" ), "Valid email" ); + ok( method( "\"name.\"@domain.tld" ), "Valid email" ); // valid without top label + ok( method( "\"name,\"@domain.tld" ), "Valid email" ); // valid without top label + ok( method( "\"name;\"@domain.tld" ), "Valid email" ); // valid without top label + ok(!method( "name" ), "Invalid email" ); + ok(!method( "name@" ), "Invalid email" ); + ok( method( "name@domain" ), "Invalid email" ); + ok(!method( "name.@domain.tld" ), "Invalid email" ); + ok(!method( "name,@domain.tld" ), "Invalid email" ); + ok(!method( "name;@domain.tld" ), "Invalid email" ); +}); + +test("number", function() { + var method = methodTest("number"); + ok( method( "123" ), "Valid number" ); + ok( method( "-123" ), "Valid number" ); + ok( method( "123,000" ), "Valid number" ); + ok( method( "-123,000" ), "Valid number" ); + ok( method( "123,000.00" ), "Valid number" ); + ok( method( "-123,000.00" ), "Valid number" ); + ok(!method( "123.000,00" ), "Invalid number" ); + ok(!method( "123.0.0,0" ), "Invalid number" ); + ok(!method( "x123" ), "Invalid number" ); + ok(!method( "100.100,0,0" ), "Invalid number" ); + + ok( method( "" ), "Blank is valid" ); + ok( method( "123" ), "Valid decimal" ); + ok( method( "123000" ), "Valid decimal" ); + ok( method( "123000.12" ), "Valid decimal" ); + ok( method( "-123000.12" ), "Valid decimal" ); + ok( method( "123.000" ), "Valid decimal" ); + ok( method( "123,000.00" ), "Valid decimal" ); + ok( method( "-123,000.00" ), "Valid decimal" ); + ok(!method( "1230,000.00" ), "Invalid decimal" ); + ok(!method( "123.0.0,0" ), "Invalid decimal" ); + ok(!method( "x123" ), "Invalid decimal" ); + ok(!method( "100.100,0,0" ), "Invalid decimal" ); +}); + +/* disabled for now, need to figure out how to test localized methods +test("numberDE", function() { + var method = methodTest("numberDE"); + ok( method( "123" ), "Valid numberDE" ); + ok( method( "-123" ), "Valid numberDE" ); + ok( method( "123.000" ), "Valid numberDE" ); + ok( method( "-123.000" ), "Valid numberDE" ); + ok( method( "123.000,00" ), "Valid numberDE" ); + ok( method( "-123.000,00" ), "Valid numberDE" ); + ok(!method( "123,000.00" ), "Invalid numberDE" ); + ok(!method( "123,0,0.0" ), "Invalid numberDE" ); + ok(!method( "x123" ), "Invalid numberDE" ); + ok(!method( "100,100.0.0" ), "Invalid numberDE" ); + + ok( method( "" ), "Blank is valid" ); + ok( method( "123" ), "Valid decimalDE" ); + ok( method( "123000" ), "Valid decimalDE" ); + ok( method( "123000,12" ), "Valid decimalDE" ); + ok( method( "-123000,12" ), "Valid decimalDE" ); + ok( method( "123.000" ), "Valid decimalDE" ); + ok( method( "123.000,00" ), "Valid decimalDE" ); + ok( method( "-123.000,00" ), "Valid decimalDE" ) + ok(!method( "123.0.0,0" ), "Invalid decimalDE" ); + ok(!method( "x123" ), "Invalid decimalDE" ); + ok(!method( "100,100.0.0" ), "Invalid decimalDE" ); +}); +*/ + +test("date", function() { + var method = methodTest("date"); + ok( method( "06/06/1990" ), "Valid date" ); + ok( method( "6/6/06" ), "Valid date" ); + ok(!method( "1990x-06-06" ), "Invalid date" ); +}); + +test("dateISO", function() { + var method = methodTest("dateISO"); + ok( method( "1990-06-06" ), "Valid date" ); + ok( method( "1990/06/06" ), "Valid date" ); + ok( method( "1990-6-6" ), "Valid date" ); + ok( method( "1990/6/6" ), "Valid date" ); + ok(!method( "1990-106-06" ), "Invalid date" ); + ok(!method( "190-06-06" ), "Invalid date" ); +}); + +/* disabled for now, need to figure out how to test localized methods +test("dateDE", function() { + var method = methodTest("dateDE"); + ok( method( "03.06.1984" ), "Valid dateDE" ); + ok( method( "3.6.84" ), "Valid dateDE" ); + ok(!method( "6-6-06" ), "Invalid dateDE" ); + ok(!method( "1990-06-06" ), "Invalid dateDE" ); + ok(!method( "06/06/1990" ), "Invalid dateDE" ); + ok(!method( "6/6/06" ), "Invalid dateDE" ); +}); +*/ + +test("required", function() { + var v = jQuery("#form").validate(), + method = $.validator.methods.required, + e = $('#text1, #text1b, #hidden2, #select1, #select2'); + ok( method.call( v, e[0].value, e[0]), "Valid text input" ); + ok(!method.call( v, e[1].value, e[1]), "Invalid text input" ); + ok(!method.call( v, e[1].value, e[2]), "Invalid text input" ); + + ok(!method.call( v, e[2].value, e[3]), "Invalid select" ); + ok( method.call( v, e[3].value, e[4]), "Valid select" ); + + e = $('#area1, #area2, #pw1, #pw2'); + ok( method.call( v, e[0].value, e[0]), "Valid textarea" ); + ok(!method.call( v, e[1].value, e[1]), "Invalid textarea" ); + ok( method.call( v, e[2].value, e[2]), "Valid password input" ); + ok(!method.call( v, e[3].value, e[3]), "Invalid password input" ); + + e = $('#radio1, #radio2, #radio3'); + ok(!method.call( v, e[0].value, e[0]), "Invalid radio" ); + ok( method.call( v, e[1].value, e[1]), "Valid radio" ); + ok( method.call( v, e[2].value, e[2]), "Valid radio" ); + + e = $('#check1, #check2'); + ok( method.call( v, e[0].value, e[0]), "Valid checkbox" ); + ok(!method.call( v, e[1].value, e[1]), "Invalid checkbox" ); + + e = $('#select1, #select2, #select3, #select4'); + ok(!method.call( v, e[0].value, e[0]), "Invalid select" ); + ok( method.call( v, e[1].value, e[1]), "Valid select" ); + ok( method.call( v, e[2].value, e[2]), "Valid select" ); + ok( method.call( v, e[3].value, e[3]), "Valid select" ); +}); + +test("required with dependencies", function() { + var v = jQuery("#form").validate(), + method = $.validator.methods.required, + e = $('#hidden2, #select1, #area2, #radio1, #check2'); + ok( method.call( v, e[0].value, e[0], "asffsaa"), "Valid text input due to depencie not met" ); + ok(!method.call( v, e[0].value, e[0], "input"), "Invalid text input" ); + ok( method.call( v, e[0].value, e[0], function() { return false; }), "Valid text input due to depencie not met" ); + ok(!method.call( v, e[0].value, e[0], function() { return true; }), "Invalid text input" ); + ok( method.call( v, e[1].value, e[1], "asfsfa"), "Valid select due to dependency not met" ); + ok(!method.call( v, e[1].value, e[1], "input"), "Invalid select" ); + ok( method.call( v, e[2].value, e[2], "asfsafsfa"), "Valid textarea due to dependency not met" ); + ok(!method.call( v, e[2].value, e[2], "input"), "Invalid textarea" ); + ok( method.call( v, e[3].value, e[3], "asfsafsfa"), "Valid radio due to dependency not met" ); + ok(!method.call( v, e[3].value, e[3], "input"), "Invalid radio" ); + ok( method.call( v, e[4].value, e[4], "asfsafsfa"), "Valid checkbox due to dependency not met" ); + ok(!method.call( v, e[4].value, e[4], "input"), "Invalid checkbox" ); +}); + +test("minlength", function() { + var v = jQuery("#form").validate(), + method = $.validator.methods.minlength, + param = 2, + e = $('#text1, #text1c, #text2, #text3'); + ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); + ok(!method.call( v, e[1].value, e[1], param), "Invalid text input" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); + ok( method.call( v, e[3].value, e[3], param), "Valid text input" ); + + e = $('#check1, #check2, #check3'); + ok(!method.call( v, e[0].value, e[0], param), "Valid checkbox" ); + ok( method.call( v, e[1].value, e[1], param), "Valid checkbox" ); + ok( method.call( v, e[2].value, e[2], param), "Invalid checkbox" ); + + e = $('#select1, #select2, #select3, #select4, #select5'); + ok(method.call( v, e[0].value, e[0], param), "Valid select " + e[0].id ); + ok(!method.call( v, e[1].value, e[1], param), "Invalid select " + e[1].id ); + ok( method.call( v, e[2].value, e[2], param), "Valid select " + e[2].id ); + ok( method.call( v, e[3].value, e[3], param), "Valid select " + e[3].id ); + ok( method.call( v, e[4].value, e[4], param), "Valid select " + e[4].id ); +}); + +test("maxlength", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.maxlength, + param = 4, + e = $('#text1, #text2, #text3'); + ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); + ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); + + e = $('#check1, #check2, #check3'); + ok( method.call( v, e[0].value, e[0], param), "Valid checkbox" ); + ok( method.call( v, e[1].value, e[1], param), "Invalid checkbox" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid checkbox" ); + + e = $('#select1, #select2, #select3, #select4'); + ok( method.call( v, e[0].value, e[0], param), "Valid select" ); + ok( method.call( v, e[1].value, e[1], param), "Valid select" ); + ok( method.call( v, e[2].value, e[2], param), "Valid select" ); + ok(!method.call( v, e[3].value, e[3], param), "Invalid select" ); +}); + +test("rangelength", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.rangelength, + param = [2, 4], + e = $('#text1, #text2, #text3'); + ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); + ok(!method.call( v, e[1].value, e[1], param), "Invalid text input" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); +}); + +test("min", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.min, + param = 8, + e = $('#value1, #value2, #value3'); + ok(!method.call( v, e[0].value, e[0], param), "Invalid text input" ); + ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); + ok( method.call( v, e[2].value, e[2], param), "Valid text input" ); +}); + +test("max", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.max, + param = 12, + e = $('#value1, #value2, #value3'); + ok( method.call( v, e[0].value, e[0], param), "Valid text input" ); + ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); +}); + +test("range", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.range, + param = [4,12], + e = $('#value1, #value2, #value3'); + ok(!method.call( v, e[0].value, e[0], param), "Invalid text input" ); + ok( method.call( v, e[1].value, e[1], param), "Valid text input" ); + ok(!method.call( v, e[2].value, e[2], param), "Invalid text input" ); +}); + +test("equalTo", function() { + var v = jQuery("#form").validate(); + var method = $.validator.methods.equalTo, + e = $('#text1, #text2'); + ok( method.call( v, "Test", e[0], "#text1"), "Text input" ); + ok( method.call( v, "T", e[1], "#text2"), "Another one" ); +}); + +test("creditcard", function() { + var method = methodTest("creditcard"); + ok( method( "446-667-651" ), "Valid creditcard number" ); + ok( !method( "asdf" ), "Invalid creditcard number" ); +}); + +test("accept", function() { + var method = methodTest("accept"); + ok( method( "picture.gif" ), "Valid default accept type" ); + ok( method( "picture.jpg" ), "Valid default accept type" ); + ok( method( "picture.jpeg" ), "Valid default accept type" ); + ok( method( "picture.png" ), "Valid default accept type" ); + ok( !method( "picture.pgn" ), "Invalid default accept type" ); + + var v = jQuery("#form").validate(), + method = function(value, param) { + return $.validator.methods.accept.call(v, value, $('#text1')[0], param) + }; + ok( method( "picture.doc", "doc"), "Valid custom accept type" ); + ok( method( "picture.pdf", "doc|pdf"), "Valid custom accept type" ); + ok( method( "picture.pdf", "pdf|doc"), "Valid custom accept type" ); + ok( !method( "picture.pdf", "doc"), "Invalid custom accept type" ); + ok( !method( "picture.doc", "pdf"), "Invalid custom accept type" ); + + ok( method( "picture.pdf", "doc,pdf"), "Valid custom accept type, comma seperated" ); + ok( method( "picture.pdf", "pdf,doc"), "Valid custom accept type, comma seperated" ); + ok( !method( "picture.pdf", "gop,top"), "Invalid custom accept type, comma seperated" ); +}); + +test("remote", function() { + expect(7); + stop(); + var e = $("#username"); + var v = $("#userForm").validate({ + rules: { + username: { + required: true, + remote: "users.php" + } + }, + messages: { + username: { + required: "Please", + remote: jQuery.validator.format("{0} in use") + } + }, + submitHandler: function() { + ok( false, "submitHandler may never be called when validating only elements"); + } + }); + $(document).ajaxStop(function() { + $(document).unbind("ajaxStop"); + equals( 1, v.size(), "There must be one error" ); + equals( "Peter in use", v.errorList[0].message ); + + $(document).ajaxStop(function() { + $(document).unbind("ajaxStop"); + equals( 1, v.size(), "There must be one error" ); + equals( "Peter2 in use", v.errorList[0].message ); + start(); + }); + e.val("Peter2"); + ok( !v.element(e), "new value, new request" ); + }); + ok( !v.element(e), "invalid element, nothing entered yet" ); + e.val("Peter"); + ok( !v.element(e), "still invalid, because remote validation must block until it returns" ); +}); + +test("remote, customized ajax options", function() { + expect(2); + stop(); + var v = $("#userForm").validate({ + rules: { + username: { + required: true, + remote: { + url: "users.php", + type: "post", + beforeSend: function(request, settings) { + same(settings.type, "post"); + same(settings.data, "username=asdf&email=email.com"); + }, + data: { + email: function() { + return "email.com"; + } + }, + complete: function() { + start(); + } + } + } + } + }); + $("#username").val("asdf"); + $("#userForm").valid(); +}); + + +test("remote extensions", function() { + expect(5); + stop(); + var e = $("#username"); + var v = $("#userForm").validate({ + rules: { + username: { + required: true, + remote: "users2.php" + } + }, + messages: { + username: { + required: "Please" + } + }, + submitHandler: function() { + ok( false, "submitHandler may never be called when validating only elements"); + } + }); + $(document).ajaxStop(function() { + $(document).unbind("ajaxStop"); + equals( 1, v.size(), "There must be one error" ); + equals( v.errorList[0].message, "asdf is already taken, please try something else" ); + v.element(e); + equals( v.errorList[0].message, "asdf is already taken, please try something else", "message doesn't change on revalidation" ); + start(); + }); + ok( !v.element(e), "invalid element, nothing entered yet" ); + e.val("asdf"); + ok( !v.element(e), "still invalid, because remote validation must block until it returns" ); +}); + +module("additional methods"); + +test("phone (us)", function() { + var method = methodTest("phoneUS"); + ok( method( "1(212)-999-2345" ), "Valid us phone number" ); + ok( method( "212 999 2344" ), "Valid us phone number" ); + ok( method( "212-999-0983" ), "Valid us phone number" ); + ok(!method( "111-123-5434" ), "Invalid us phone number" ); + ok(!method( "212 123 4567" ), "Invalid us phone number" ); +}); + +test("dateITA", function() { + var method = methodTest("dateITA"); + ok( method( "01/01/1900" ), "Valid date ITA" ); + ok(!method( "01/13/1990" ), "Invalid date ITA" ); + ok(!method( "01.01.1900" ), "Invalid date ITA" ); +}); + +test("time", function() { + var method = methodTest("time"); + ok( method("00:00"), "Valid time, lower bound" ); + ok( method("23:59"), "Valid time, upper bound" ); + ok( !method("24:60"), "Invalid time" ); + ok( !method("24:00"), "Invalid time" ); + ok( !method("29:59"), "Invalid time" ); + ok( !method("30:00"), "Invalid time" ); +}); + +test("minWords", function() { + var method = methodTest("minWords"); + ok( method("hello worlds", 2), "plain text, valid" ); + ok( method("hello world", 2), "html, valid" ); + ok( !method("hello", 2), "plain text, invalid" ); + ok( !method("world", 2), "html, invalid" ); + ok( !method("world
                ", 2), "html, invalid" ); +}); + +test("maxWords", function() { + var method = methodTest("maxWords"); + ok( method("hello", 2), "plain text, valid" ); + ok( method("world", 2), "html, valid" ); + ok( method("world
                ", 2), "html, valid" ); + ok( !method("hello worlds", 2), "plain text, invalid" ); + ok( !method("hello world", 2), "html, invalid" ); +}); + +function testCardTypeByNumber(number, cardname, expected) { + $("#cardnumber").val(number); + var actual = $("#ccform").valid(); + equals(actual, expected, $.format("Expect card number {0} to validate to {1}, actually validated to ", number, expected)); +} + +test('creditcardtypes, all', function() { + $("#ccform").validate({ + rules: { + cardnumber: { + creditcard: true, + creditcardtypes: { + all: true + } + } + } + }); + + testCardTypeByNumber("4111-1111-1111-1111", "VISA", true) + testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", true) + testCardTypeByNumber("6111-1111-1111-1116", "Discover", true) + testCardTypeByNumber("3400-0000-0000-009", "AMEX", true); + + testCardTypeByNumber("4111-1111-1111-1110", "VISA", false) + testCardTypeByNumber("5432-1111-1111-1111", "MasterCard", false) + testCardTypeByNumber("6611-6611-6611-6611", "Discover", false) + testCardTypeByNumber("3777-7777-7777-7777", "AMEX", false) + +}); + +test('creditcardtypes, visa', function() { + $("#ccform").validate({ + rules: { + cardnumber: { + creditcard: true, + creditcardtypes: { + visa: true + } + } + } + }); + + testCardTypeByNumber("4111-1111-1111-1111", "VISA", true) + testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", false) + testCardTypeByNumber("6111-1111-1111-1116", "Discover", false) + testCardTypeByNumber("3400-0000-0000-009", "AMEX", false); +}); + +test('creditcardtypes, mastercard', function() { + $("#ccform").validate({ + rules: { + cardnumber: { + creditcard: true, + creditcardtypes: { + mastercard: true + } + } + } + }); + + testCardTypeByNumber("5111-1111-1111-1118", "MasterCard", true) + testCardTypeByNumber("6111-1111-1111-1116", "Discover", false) + testCardTypeByNumber("3400-0000-0000-009", "AMEX", false); + testCardTypeByNumber("4111-1111-1111-1111", "VISA", false); +}); + })(jQuery); \ No newline at end of file diff --git a/test/qunit/testrunner.js b/test/qunit/testrunner.js index 8c28b6398..c1c5cae86 100644 --- a/test/qunit/testrunner.js +++ b/test/qunit/testrunner.js @@ -1,803 +1,803 @@ -/* - * QUnit - jQuery unit testrunner - * - * http://docs.jquery.com/QUnit - * - * Copyright (c) 2008 John Resig, Jörn Zaefferer - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Id: testrunner.js 6416 2009-07-10 16:08:27Z joern.zaefferer $ - */ - -(function($) { - -// Test for equality any JavaScript type. -// Discussions and reference: http://philrathe.com/articles/equiv -// Test suites: http://philrathe.com/tests/equiv -// Author: Philippe Rathé -var equiv = function () { - - var innerEquiv; // the real equiv function - var callers = []; // stack to decide between skip/abort functions - - - // Determine what is o. - function hoozit(o) { - if (o.constructor === String) { - return "string"; - - } else if (o.constructor === Boolean) { - return "boolean"; - - } else if (o.constructor === Number) { - - if (isNaN(o)) { - return "nan"; - } else { - return "number"; - } - - } else if (typeof o === "undefined") { - return "undefined"; - - // consider: typeof null === object - } else if (o === null) { - return "null"; - - // consider: typeof [] === object - } else if (o instanceof Array) { - return "array"; - - // consider: typeof new Date() === object - } else if (o instanceof Date) { - return "date"; - - // consider: /./ instanceof Object; - // /./ instanceof RegExp; - // typeof /./ === "function"; // => false in IE and Opera, - // true in FF and Safari - } else if (o instanceof RegExp) { - return "regexp"; - - } else if (typeof o === "object") { - return "object"; - - } else if (o instanceof Function) { - return "function"; - } else { - return undefined; - } - } - - // Call the o related callback with the given arguments. - function bindCallbacks(o, callbacks, args) { - var prop = hoozit(o); - if (prop) { - if (hoozit(callbacks[prop]) === "function") { - return callbacks[prop].apply(callbacks, args); - } else { - return callbacks[prop]; // or undefined - } - } - } - - var callbacks = function () { - - // for string, boolean, number and null - function useStrictEquality(b, a) { - if (b instanceof a.constructor || a instanceof b.constructor) { - // to catch short annotaion VS 'new' annotation of a declaration - // e.g. var i = 1; - // var j = new Number(1); - return a == b; - } else { - return a === b; - } - } - - return { - "string": useStrictEquality, - "boolean": useStrictEquality, - "number": useStrictEquality, - "null": useStrictEquality, - "undefined": useStrictEquality, - - "nan": function (b) { - return isNaN(b); - }, - - "date": function (b, a) { - return hoozit(b) === "date" && a.valueOf() === b.valueOf(); - }, - - "regexp": function (b, a) { - return hoozit(b) === "regexp" && - a.source === b.source && // the regex itself - a.global === b.global && // and its modifers (gmi) ... - a.ignoreCase === b.ignoreCase && - a.multiline === b.multiline; - }, - - // - skip when the property is a method of an instance (OOP) - // - abort otherwise, - // initial === would have catch identical references anyway - "function": function () { - var caller = callers[callers.length - 1]; - return caller !== Object && - typeof caller !== "undefined"; - }, - - "array": function (b, a) { - var i; - var len; - - // b could be an object literal here - if ( ! (hoozit(b) === "array")) { - return false; - } - - len = a.length; - if (len !== b.length) { // safe and faster - return false; - } - for (i = 0; i < len; i++) { - if( ! innerEquiv(a[i], b[i])) { - return false; - } - } - return true; - }, - - "object": function (b, a) { - var i; - var eq = true; // unless we can proove it - var aProperties = [], bProperties = []; // collection of strings - - // comparing constructors is more strict than using instanceof - if ( a.constructor !== b.constructor) { - return false; - } - - // stack constructor before traversing properties - callers.push(a.constructor); - - for (i in a) { // be strict: don't ensures hasOwnProperty and go deep - - aProperties.push(i); // collect a's properties - - if ( ! innerEquiv(a[i], b[i])) { - eq = false; - } - } - - callers.pop(); // unstack, we are done - - for (i in b) { - bProperties.push(i); // collect b's properties - } - - // Ensures identical properties name - return eq && innerEquiv(aProperties.sort(), bProperties.sort()); - } - }; - }(); - - innerEquiv = function () { // can take multiple arguments - var args = Array.prototype.slice.apply(arguments); - if (args.length < 2) { - return true; // end transition - } - - return (function (a, b) { - if (a === b) { - return true; // catch the most you can - } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) { - return false; // don't lose time with error prone cases - } else { - return bindCallbacks(a, callbacks, [b, a]); - } - - // apply transition with (1..n) arguments - })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1)); - }; - - return innerEquiv; - -}(); - -var GETParams = $.map( location.search.slice(1).split('&'), decodeURIComponent ), - ngindex = $.inArray("noglobals", GETParams), - noglobals = ngindex !== -1; - -if( noglobals ) - GETParams.splice( ngindex, 1 ); - -var config = { - stats: { - all: 0, - bad: 0 - }, - queue: [], - // block until document ready - blocking: true, - //restrict modules/tests by get parameters - filters: GETParams, - isLocal: !!(window.location.protocol == 'file:') -}; - -// public API as global methods -$.extend(window, { - test: test, - module: module, - expect: expect, - ok: ok, - equals: equals, - start: start, - stop: stop, - reset: reset, - isLocal: config.isLocal, - same: function(a, b, message) { - push(equiv(a, b), a, b, message); - }, - QUnit: { - equiv: equiv, - ok: ok, - done: function(failures, total){}, - log: function(result, message){} - }, - // legacy methods below - isSet: isSet, - isObj: isObj, - compare: function() { - throw "compare is deprecated - use same() instead"; - }, - compare2: function() { - throw "compare2 is deprecated - use same() instead"; - }, - serialArray: function() { - throw "serialArray is deprecated - use jsDump.parse() instead"; - }, - q: q, - t: t, - url: url, - triggerEvent: triggerEvent -}); - -$(window).load(function() { - - if (!$("#header, #banner, #userAgent, #tests").length) { - $('body').prepend( - '

                ' + document.title + '

                ' + - '' + - '

                ' + - '
                  ' - ); - } - - $('#userAgent').html(navigator.userAgent); - var head = $('
                  ').insertAfter("#userAgent"); - $('').attr("disabled", true).prependTo(head).click(function() { - $('li.pass')[this.checked ? 'hide' : 'show'](); - }); - $('').attr("disabled", true).appendTo(head).click(function() { - $("li.fail:contains('missing test - untested code is broken code')").parent('ol').parent('li.fail')[this.checked ? 'hide' : 'show'](); - }); - $("#filter-missing").after(''); - runTest(); -}); - -function synchronize(callback) { - config.queue.push(callback); - if(!config.blocking) { - process(); - } -} - -function process() { - while(config.queue.length && !config.blocking) { - config.queue.shift()(); - } -} - -function stop(timeout) { - config.blocking = true; - if (timeout) - config.timeout = setTimeout(function() { - QUnit.ok( false, "Test timed out" ); - start(); - }, timeout); -} -function start() { - // A slight delay, to avoid any current callbacks - setTimeout(function() { - if(config.timeout) - clearTimeout(config.timeout); - config.blocking = false; - process(); - }, 13); -} - -function validTest( name ) { - var i = config.filters.length, - run = false; - - if( !i ) - return true; - - while( i-- ){ - var filter = config.filters[i], - not = filter.charAt(0) == '!'; - if( not ) - filter = filter.slice(1); - if( name.indexOf(filter) != -1 ) - return !not; - if( not ) - run = true; - } - return run; -} - -function runTest() { - config.blocking = false; - var started = +new Date; - config.fixture = document.getElementById('main').innerHTML; - config.ajaxSettings = $.ajaxSettings; - synchronize(function() { - $('

                  ').html(['Tests completed in ', - +new Date - started, ' milliseconds.
                  ', - '', config.stats.all - config.stats.bad, ' tests of ', config.stats.all, ' passed, ', config.stats.bad,' failed.'] - .join('')) - .appendTo("body"); - $("#banner").addClass(config.stats.bad ? "fail" : "pass"); - QUnit.done( config.stats.bad, config.stats.all ); - }); -} - -var pollution; - -function saveGlobal(){ - pollution = [ ]; - - if( noglobals ) - for( var key in window ) - pollution.push(key); -} -function checkPollution( name ){ - var old = pollution; - saveGlobal(); - - if( pollution.length > old.length ){ - ok( false, "Introduced global variable(s): " + diff(old, pollution).join(", ") ); - config.expected++; - } -} - -function diff( clean, dirty ){ - return $.grep( dirty, function(name){ - return $.inArray( name, clean ) == -1; - }); -} - -function test(name, callback) { - if(config.currentModule) - name = config.currentModule + " module: " + name + ""; - var lifecycle = $.extend({ - setup: function() {}, - teardown: function() {} - }, config.moduleLifecycle); - - if ( !validTest(name) ) - return; - - var testEnvironment = {}; - - synchronize(function() { - config.assertions = []; - config.expected = null; - try { - if( !pollution ) - saveGlobal(); - lifecycle.setup.call(testEnvironment); - } catch(e) { - QUnit.ok( false, "Setup failed on " + name + ": " + e.message ); - } - }); - synchronize(function() { - try { - callback.call(testEnvironment); - } catch(e) { - fail("Test " + name + " died, exception and test follows", e, callback); - QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message ); - // else next test will carry the responsibility - saveGlobal(); - } - }); - synchronize(function() { - try { - checkPollution(); - lifecycle.teardown.call(testEnvironment); - } catch(e) { - QUnit.ok( false, "Teardown failed on " + name + ": " + e.message ); - } - }); - synchronize(function() { - try { - reset(); - } catch(e) { - fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset); - } - - if(config.expected && config.expected != config.assertions.length) { - QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" ); - } - - var good = 0, bad = 0; - var ol = $("

                    ").hide(); - config.stats.all += config.assertions.length; - for ( var i = 0; i < config.assertions.length; i++ ) { - var assertion = config.assertions[i]; - $("
                  1. ").addClass(assertion.result ? "pass" : "fail").text(assertion.message || "(no message)").appendTo(ol); - assertion.result ? good++ : bad++; - } - config.stats.bad += bad; - - var b = $("").html(name + " (" + bad + ", " + good + ", " + config.assertions.length + ")") - .click(function(){ - $(this).next().toggle(); - }) - .dblclick(function(event) { - var target = $(event.target).filter("strong").clone(); - if ( target.length ) { - target.children().remove(); - location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text())); - } - }); - - $("
                  2. ").addClass(bad ? "fail" : "pass").append(b).append(ol).appendTo("#tests"); - - if(bad) { - $("#filter-pass").attr("disabled", null); - $("#filter-missing").attr("disabled", null); - } - }); -} - -function fail(message, exception, callback) { - if( typeof console != "undefined" && console.error && console.warn ) { - console.error(message); - console.error(exception); - console.warn(callback.toString()); - } else if (window.opera && opera.postError) { - opera.postError(message, exception, callback.toString); - } -} - -// call on start of module test to prepend name to all tests -function module(name, lifecycle) { - config.currentModule = name; - config.moduleLifecycle = lifecycle; -} - -/** - * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. - */ -function expect(asserts) { - config.expected = asserts; -} - -/** - * Resets the test setup. Useful for tests that modify the DOM. - */ -function reset() { - $("#main").html( config.fixture ); - $.event.global = {}; - $.ajaxSettings = $.extend({}, config.ajaxSettings); -} - -/** - * Asserts true. - * @example ok( $("a").size() > 5, "There must be at least 5 anchors" ); - */ -function ok(a, msg) { - QUnit.log(a, msg); - - config.assertions.push({ - result: !!a, - message: msg - }); -} - -/** - * Asserts that two arrays are the same - */ -function isSet(a, b, msg) { - function serialArray( a ) { - var r = []; - - if ( a && a.length ) - for ( var i = 0; i < a.length; i++ ) { - var str = a[i].nodeName; - if ( str ) { - str = str.toLowerCase(); - if ( a[i].id ) - str += "#" + a[i].id; - } else - str = a[i]; - r.push( str ); - } - - return "[ " + r.join(", ") + " ]"; - } - var ret = true; - if ( a && b && a.length != undefined && a.length == b.length ) { - for ( var i = 0; i < a.length; i++ ) - if ( a[i] != b[i] ) - ret = false; - } else - ret = false; - QUnit.ok( ret, !ret ? (msg + " expected: " + serialArray(b) + " result: " + serialArray(a)) : msg ); -} - -/** - * Asserts that two objects are equivalent - */ -function isObj(a, b, msg) { - var ret = true; - - if ( a && b ) { - for ( var i in a ) - if ( a[i] != b[i] ) - ret = false; - - for ( i in b ) - if ( a[i] != b[i] ) - ret = false; - } else - ret = false; - - QUnit.ok( ret, msg ); -} - -/** - * Returns an array of elements with the given IDs, eg. - * @example q("main", "foo", "bar") - * @result [
                    , , ] - */ -function q() { - var r = []; - for ( var i = 0; i < arguments.length; i++ ) - r.push( document.getElementById( arguments[i] ) ); - return r; -} - -/** - * Asserts that a select matches the given IDs - * @example t("Check for something", "//[a]", ["foo", "baar"]); - * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar' - */ -function t(a,b,c) { - var f = $(b); - var s = ""; - for ( var i = 0; i < f.length; i++ ) - s += (s && ",") + '"' + f[i].id + '"'; - isSet(f, q.apply(q,c), a + " (" + b + ")"); -} - -/** - * Add random number to url to stop IE from caching - * - * @example url("data/test.html") - * @result "data/test.html?10538358428943" - * - * @example url("data/test.php?foo=bar") - * @result "data/test.php?foo=bar&10538358345554" - */ -function url(value) { - return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000); -} - -/** - * Checks that the first two arguments are equal, with an optional message. - * Prints out both actual and expected values. - * - * Prefered to ok( actual == expected, message ) - * - * @example equals( $.format("Received {0} bytes.", 2), "Received 2 bytes." ); - * - * @param Object actual - * @param Object expected - * @param String message (optional) - */ -function equals(actual, expected, message) { - push(expected == actual, actual, expected, message); -} - -function push(result, actual, expected, message) { - message = message || (result ? "okay" : "failed"); - QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) ); -} - -/** - * Trigger an event on an element. - * - * @example triggerEvent( document.body, "click" ); - * - * @param DOMElement elem - * @param String type - */ -function triggerEvent( elem, type, event ) { - if ( $.browser.mozilla || $.browser.opera ) { - event = document.createEvent("MouseEvents"); - event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, - 0, 0, 0, 0, 0, false, false, false, false, 0, null); - elem.dispatchEvent( event ); - } else if ( $.browser.msie ) { - elem.fireEvent("on"+type); - } -} - -})(jQuery); - -/** - * jsDump - * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com - * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php) - * Date: 5/15/2008 - * @projectDescription Advanced and extensible data dumping for Javascript. - * @version 1.0.0 - * @author Ariel Flesler - * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html} - */ -(function(){ - function quote( str ){ - return '"' + str.toString().replace(/"/g, '\\"') + '"'; - }; - function literal( o ){ - return o + ''; - }; - function join( pre, arr, post ){ - var s = jsDump.separator(), - base = jsDump.indent(), - inner = jsDump.indent(1); - if( arr.join ) - arr = arr.join( ',' + s + inner ); - if( !arr ) - return pre + post; - return [ pre, inner + arr, base + post ].join(s); - }; - function array( arr ){ - var i = arr.length, ret = Array(i); - this.up(); - while( i-- ) - ret[i] = this.parse( arr[i] ); - this.down(); - return join( '[', ret, ']' ); - }; - - var reName = /^function (\w+)/; - - var jsDump = window.jsDump = { - parse:function( obj, type ){//type is used mostly internally, you can fix a (custom)type in advance - var parser = this.parsers[ type || this.typeOf(obj) ]; - type = typeof parser; - - return type == 'function' ? parser.call( this, obj ) : - type == 'string' ? parser : - this.parsers.error; - }, - typeOf:function( obj ){ - var type = typeof obj, - f = 'function';//we'll use it 3 times, save it - return type != 'object' && type != f ? type : - !obj ? 'null' : - obj.exec ? 'regexp' :// some browsers (FF) consider regexps functions - obj.getHours ? 'date' : - obj.scrollBy ? 'window' : - obj.nodeName == '#document' ? 'document' : - obj.nodeName ? 'node' : - obj.item ? 'nodelist' : // Safari reports nodelists as functions - obj.callee ? 'arguments' : - obj.call || obj.constructor != Array && //an array would also fall on this hack - (obj+'').indexOf(f) != -1 ? f : //IE reports functions like alert, as objects - 'length' in obj ? 'array' : - type; - }, - separator:function(){ - return this.multiline ? this.HTML ? '
                    ' : '\n' : this.HTML ? ' ' : ' '; - }, - indent:function( extra ){// extra can be a number, shortcut for increasing-calling-decreasing - if( !this.multiline ) - return ''; - var chr = this.indentChar; - if( this.HTML ) - chr = chr.replace(/\t/g,' ').replace(/ /g,' '); - return Array( this._depth_ + (extra||0) ).join(chr); - }, - up:function( a ){ - this._depth_ += a || 1; - }, - down:function( a ){ - this._depth_ -= a || 1; - }, - setParser:function( name, parser ){ - this.parsers[name] = parser; - }, - // The next 3 are exposed so you can use them - quote:quote, - literal:literal, - join:join, - // - _depth_: 1, - // This is the list of parsers, to modify them, use jsDump.setParser - parsers:{ - window: '[Window]', - document: '[Document]', - error:'[ERROR]', //when no parser is found, shouldn't happen - unknown: '[Unknown]', - 'null':'null', - undefined:'undefined', - 'function':function( fn ){ - var ret = 'function', - name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE - if( name ) - ret += ' ' + name; - ret += '('; - - ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join(''); - return join( ret, this.parse(fn,'functionCode'), '}' ); - }, - array: array, - nodelist: array, - arguments: array, - object:function( map ){ - var ret = [ ]; - this.up(); - for( var key in map ) - ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) ); - this.down(); - return join( '{', ret, '}' ); - }, - node:function( node ){ - var open = this.HTML ? '<' : '<', - close = this.HTML ? '>' : '>'; - - var tag = node.nodeName.toLowerCase(), - ret = open + tag; - - for( var a in this.DOMAttrs ){ - var val = node[this.DOMAttrs[a]]; - if( val ) - ret += ' ' + a + '=' + this.parse( val, 'attribute' ); - } - return ret + close + open + '/' + tag + close; - }, - functionArgs:function( fn ){//function calls it internally, it's the arguments part of the function - var l = fn.length; - if( !l ) return ''; - - var args = Array(l); - while( l-- ) - args[l] = String.fromCharCode(97+l);//97 is 'a' - return ' ' + args.join(', ') + ' '; - }, - key:quote, //object calls it internally, the key part of an item in a map - functionCode:'[code]', //function calls it internally, it's the content of the function - attribute:quote, //node calls it internally, it's an html attribute value - string:quote, - date:quote, - regexp:literal, //regex - number:literal, - 'boolean':literal - }, - DOMAttrs:{//attributes to dump from nodes, name=>realName - id:'id', - name:'name', - 'class':'className' - }, - HTML:false,//if true, entities are escaped ( <, >, \t, space and \n ) - indentChar:' ',//indentation unit - multiline:true //if true, items in a collection, are separated by a \n, else just a space. - }; - -})(); +/* + * QUnit - jQuery unit testrunner + * + * http://docs.jquery.com/QUnit + * + * Copyright (c) 2008 John Resig, Jörn Zaefferer + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Id: testrunner.js 6416 2009-07-10 16:08:27Z joern.zaefferer $ + */ + +(function($) { + +// Test for equality any JavaScript type. +// Discussions and reference: http://philrathe.com/articles/equiv +// Test suites: http://philrathe.com/tests/equiv +// Author: Philippe Rathé +var equiv = function () { + + var innerEquiv; // the real equiv function + var callers = []; // stack to decide between skip/abort functions + + + // Determine what is o. + function hoozit(o) { + if (o.constructor === String) { + return "string"; + + } else if (o.constructor === Boolean) { + return "boolean"; + + } else if (o.constructor === Number) { + + if (isNaN(o)) { + return "nan"; + } else { + return "number"; + } + + } else if (typeof o === "undefined") { + return "undefined"; + + // consider: typeof null === object + } else if (o === null) { + return "null"; + + // consider: typeof [] === object + } else if (o instanceof Array) { + return "array"; + + // consider: typeof new Date() === object + } else if (o instanceof Date) { + return "date"; + + // consider: /./ instanceof Object; + // /./ instanceof RegExp; + // typeof /./ === "function"; // => false in IE and Opera, + // true in FF and Safari + } else if (o instanceof RegExp) { + return "regexp"; + + } else if (typeof o === "object") { + return "object"; + + } else if (o instanceof Function) { + return "function"; + } else { + return undefined; + } + } + + // Call the o related callback with the given arguments. + function bindCallbacks(o, callbacks, args) { + var prop = hoozit(o); + if (prop) { + if (hoozit(callbacks[prop]) === "function") { + return callbacks[prop].apply(callbacks, args); + } else { + return callbacks[prop]; // or undefined + } + } + } + + var callbacks = function () { + + // for string, boolean, number and null + function useStrictEquality(b, a) { + if (b instanceof a.constructor || a instanceof b.constructor) { + // to catch short annotaion VS 'new' annotation of a declaration + // e.g. var i = 1; + // var j = new Number(1); + return a == b; + } else { + return a === b; + } + } + + return { + "string": useStrictEquality, + "boolean": useStrictEquality, + "number": useStrictEquality, + "null": useStrictEquality, + "undefined": useStrictEquality, + + "nan": function (b) { + return isNaN(b); + }, + + "date": function (b, a) { + return hoozit(b) === "date" && a.valueOf() === b.valueOf(); + }, + + "regexp": function (b, a) { + return hoozit(b) === "regexp" && + a.source === b.source && // the regex itself + a.global === b.global && // and its modifers (gmi) ... + a.ignoreCase === b.ignoreCase && + a.multiline === b.multiline; + }, + + // - skip when the property is a method of an instance (OOP) + // - abort otherwise, + // initial === would have catch identical references anyway + "function": function () { + var caller = callers[callers.length - 1]; + return caller !== Object && + typeof caller !== "undefined"; + }, + + "array": function (b, a) { + var i; + var len; + + // b could be an object literal here + if ( ! (hoozit(b) === "array")) { + return false; + } + + len = a.length; + if (len !== b.length) { // safe and faster + return false; + } + for (i = 0; i < len; i++) { + if( ! innerEquiv(a[i], b[i])) { + return false; + } + } + return true; + }, + + "object": function (b, a) { + var i; + var eq = true; // unless we can proove it + var aProperties = [], bProperties = []; // collection of strings + + // comparing constructors is more strict than using instanceof + if ( a.constructor !== b.constructor) { + return false; + } + + // stack constructor before traversing properties + callers.push(a.constructor); + + for (i in a) { // be strict: don't ensures hasOwnProperty and go deep + + aProperties.push(i); // collect a's properties + + if ( ! innerEquiv(a[i], b[i])) { + eq = false; + } + } + + callers.pop(); // unstack, we are done + + for (i in b) { + bProperties.push(i); // collect b's properties + } + + // Ensures identical properties name + return eq && innerEquiv(aProperties.sort(), bProperties.sort()); + } + }; + }(); + + innerEquiv = function () { // can take multiple arguments + var args = Array.prototype.slice.apply(arguments); + if (args.length < 2) { + return true; // end transition + } + + return (function (a, b) { + if (a === b) { + return true; // catch the most you can + } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) { + return false; // don't lose time with error prone cases + } else { + return bindCallbacks(a, callbacks, [b, a]); + } + + // apply transition with (1..n) arguments + })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1)); + }; + + return innerEquiv; + +}(); + +var GETParams = $.map( location.search.slice(1).split('&'), decodeURIComponent ), + ngindex = $.inArray("noglobals", GETParams), + noglobals = ngindex !== -1; + +if( noglobals ) + GETParams.splice( ngindex, 1 ); + +var config = { + stats: { + all: 0, + bad: 0 + }, + queue: [], + // block until document ready + blocking: true, + //restrict modules/tests by get parameters + filters: GETParams, + isLocal: !!(window.location.protocol == 'file:') +}; + +// public API as global methods +$.extend(window, { + test: test, + module: module, + expect: expect, + ok: ok, + equals: equals, + start: start, + stop: stop, + reset: reset, + isLocal: config.isLocal, + same: function(a, b, message) { + push(equiv(a, b), a, b, message); + }, + QUnit: { + equiv: equiv, + ok: ok, + done: function(failures, total){}, + log: function(result, message){} + }, + // legacy methods below + isSet: isSet, + isObj: isObj, + compare: function() { + throw "compare is deprecated - use same() instead"; + }, + compare2: function() { + throw "compare2 is deprecated - use same() instead"; + }, + serialArray: function() { + throw "serialArray is deprecated - use jsDump.parse() instead"; + }, + q: q, + t: t, + url: url, + triggerEvent: triggerEvent +}); + +$(window).load(function() { + + if (!$("#header, #banner, #userAgent, #tests").length) { + $('body').prepend( + '

                    ' + document.title + '

                    ' + + '' + + '

                    ' + + '
                      ' + ); + } + + $('#userAgent').html(navigator.userAgent); + var head = $('
                      ').insertAfter("#userAgent"); + $('').attr("disabled", true).prependTo(head).click(function() { + $('li.pass')[this.checked ? 'hide' : 'show'](); + }); + $('').attr("disabled", true).appendTo(head).click(function() { + $("li.fail:contains('missing test - untested code is broken code')").parent('ol').parent('li.fail')[this.checked ? 'hide' : 'show'](); + }); + $("#filter-missing").after(''); + runTest(); +}); + +function synchronize(callback) { + config.queue.push(callback); + if(!config.blocking) { + process(); + } +} + +function process() { + while(config.queue.length && !config.blocking) { + config.queue.shift()(); + } +} + +function stop(timeout) { + config.blocking = true; + if (timeout) + config.timeout = setTimeout(function() { + QUnit.ok( false, "Test timed out" ); + start(); + }, timeout); +} +function start() { + // A slight delay, to avoid any current callbacks + setTimeout(function() { + if(config.timeout) + clearTimeout(config.timeout); + config.blocking = false; + process(); + }, 13); +} + +function validTest( name ) { + var i = config.filters.length, + run = false; + + if( !i ) + return true; + + while( i-- ){ + var filter = config.filters[i], + not = filter.charAt(0) == '!'; + if( not ) + filter = filter.slice(1); + if( name.indexOf(filter) != -1 ) + return !not; + if( not ) + run = true; + } + return run; +} + +function runTest() { + config.blocking = false; + var started = +new Date; + config.fixture = document.getElementById('main').innerHTML; + config.ajaxSettings = $.ajaxSettings; + synchronize(function() { + $('

                      ').html(['Tests completed in ', + +new Date - started, ' milliseconds.
                      ', + '', config.stats.all - config.stats.bad, ' tests of ', config.stats.all, ' passed, ', config.stats.bad,' failed.'] + .join('')) + .appendTo("body"); + $("#banner").addClass(config.stats.bad ? "fail" : "pass"); + QUnit.done( config.stats.bad, config.stats.all ); + }); +} + +var pollution; + +function saveGlobal(){ + pollution = [ ]; + + if( noglobals ) + for( var key in window ) + pollution.push(key); +} +function checkPollution( name ){ + var old = pollution; + saveGlobal(); + + if( pollution.length > old.length ){ + ok( false, "Introduced global variable(s): " + diff(old, pollution).join(", ") ); + config.expected++; + } +} + +function diff( clean, dirty ){ + return $.grep( dirty, function(name){ + return $.inArray( name, clean ) == -1; + }); +} + +function test(name, callback) { + if(config.currentModule) + name = config.currentModule + " module: " + name + ""; + var lifecycle = $.extend({ + setup: function() {}, + teardown: function() {} + }, config.moduleLifecycle); + + if ( !validTest(name) ) + return; + + var testEnvironment = {}; + + synchronize(function() { + config.assertions = []; + config.expected = null; + try { + if( !pollution ) + saveGlobal(); + lifecycle.setup.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Setup failed on " + name + ": " + e.message ); + } + }); + synchronize(function() { + try { + callback.call(testEnvironment); + } catch(e) { + fail("Test " + name + " died, exception and test follows", e, callback); + QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message ); + // else next test will carry the responsibility + saveGlobal(); + } + }); + synchronize(function() { + try { + checkPollution(); + lifecycle.teardown.call(testEnvironment); + } catch(e) { + QUnit.ok( false, "Teardown failed on " + name + ": " + e.message ); + } + }); + synchronize(function() { + try { + reset(); + } catch(e) { + fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset); + } + + if(config.expected && config.expected != config.assertions.length) { + QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" ); + } + + var good = 0, bad = 0; + var ol = $("

                        ").hide(); + config.stats.all += config.assertions.length; + for ( var i = 0; i < config.assertions.length; i++ ) { + var assertion = config.assertions[i]; + $("
                      1. ").addClass(assertion.result ? "pass" : "fail").text(assertion.message || "(no message)").appendTo(ol); + assertion.result ? good++ : bad++; + } + config.stats.bad += bad; + + var b = $("").html(name + " (" + bad + ", " + good + ", " + config.assertions.length + ")") + .click(function(){ + $(this).next().toggle(); + }) + .dblclick(function(event) { + var target = $(event.target).filter("strong").clone(); + if ( target.length ) { + target.children().remove(); + location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text())); + } + }); + + $("
                      2. ").addClass(bad ? "fail" : "pass").append(b).append(ol).appendTo("#tests"); + + if(bad) { + $("#filter-pass").attr("disabled", null); + $("#filter-missing").attr("disabled", null); + } + }); +} + +function fail(message, exception, callback) { + if( typeof console != "undefined" && console.error && console.warn ) { + console.error(message); + console.error(exception); + console.warn(callback.toString()); + } else if (window.opera && opera.postError) { + opera.postError(message, exception, callback.toString); + } +} + +// call on start of module test to prepend name to all tests +function module(name, lifecycle) { + config.currentModule = name; + config.moduleLifecycle = lifecycle; +} + +/** + * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through. + */ +function expect(asserts) { + config.expected = asserts; +} + +/** + * Resets the test setup. Useful for tests that modify the DOM. + */ +function reset() { + $("#main").html( config.fixture ); + $.event.global = {}; + $.ajaxSettings = $.extend({}, config.ajaxSettings); +} + +/** + * Asserts true. + * @example ok( $("a").size() > 5, "There must be at least 5 anchors" ); + */ +function ok(a, msg) { + QUnit.log(a, msg); + + config.assertions.push({ + result: !!a, + message: msg + }); +} + +/** + * Asserts that two arrays are the same + */ +function isSet(a, b, msg) { + function serialArray( a ) { + var r = []; + + if ( a && a.length ) + for ( var i = 0; i < a.length; i++ ) { + var str = a[i].nodeName; + if ( str ) { + str = str.toLowerCase(); + if ( a[i].id ) + str += "#" + a[i].id; + } else + str = a[i]; + r.push( str ); + } + + return "[ " + r.join(", ") + " ]"; + } + var ret = true; + if ( a && b && a.length != undefined && a.length == b.length ) { + for ( var i = 0; i < a.length; i++ ) + if ( a[i] != b[i] ) + ret = false; + } else + ret = false; + QUnit.ok( ret, !ret ? (msg + " expected: " + serialArray(b) + " result: " + serialArray(a)) : msg ); +} + +/** + * Asserts that two objects are equivalent + */ +function isObj(a, b, msg) { + var ret = true; + + if ( a && b ) { + for ( var i in a ) + if ( a[i] != b[i] ) + ret = false; + + for ( i in b ) + if ( a[i] != b[i] ) + ret = false; + } else + ret = false; + + QUnit.ok( ret, msg ); +} + +/** + * Returns an array of elements with the given IDs, eg. + * @example q("main", "foo", "bar") + * @result [
                        , , ] + */ +function q() { + var r = []; + for ( var i = 0; i < arguments.length; i++ ) + r.push( document.getElementById( arguments[i] ) ); + return r; +} + +/** + * Asserts that a select matches the given IDs + * @example t("Check for something", "//[a]", ["foo", "baar"]); + * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar' + */ +function t(a,b,c) { + var f = $(b); + var s = ""; + for ( var i = 0; i < f.length; i++ ) + s += (s && ",") + '"' + f[i].id + '"'; + isSet(f, q.apply(q,c), a + " (" + b + ")"); +} + +/** + * Add random number to url to stop IE from caching + * + * @example url("data/test.html") + * @result "data/test.html?10538358428943" + * + * @example url("data/test.php?foo=bar") + * @result "data/test.php?foo=bar&10538358345554" + */ +function url(value) { + return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000); +} + +/** + * Checks that the first two arguments are equal, with an optional message. + * Prints out both actual and expected values. + * + * Prefered to ok( actual == expected, message ) + * + * @example equals( $.format("Received {0} bytes.", 2), "Received 2 bytes." ); + * + * @param Object actual + * @param Object expected + * @param String message (optional) + */ +function equals(actual, expected, message) { + push(expected == actual, actual, expected, message); +} + +function push(result, actual, expected, message) { + message = message || (result ? "okay" : "failed"); + QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + jsDump.parse(expected) + " result: " + jsDump.parse(actual) ); +} + +/** + * Trigger an event on an element. + * + * @example triggerEvent( document.body, "click" ); + * + * @param DOMElement elem + * @param String type + */ +function triggerEvent( elem, type, event ) { + if ( $.browser.mozilla || $.browser.opera ) { + event = document.createEvent("MouseEvents"); + event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView, + 0, 0, 0, 0, 0, false, false, false, false, 0, null); + elem.dispatchEvent( event ); + } else if ( $.browser.msie ) { + elem.fireEvent("on"+type); + } +} + +})(jQuery); + +/** + * jsDump + * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com + * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php) + * Date: 5/15/2008 + * @projectDescription Advanced and extensible data dumping for Javascript. + * @version 1.0.0 + * @author Ariel Flesler + * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html} + */ +(function(){ + function quote( str ){ + return '"' + str.toString().replace(/"/g, '\\"') + '"'; + }; + function literal( o ){ + return o + ''; + }; + function join( pre, arr, post ){ + var s = jsDump.separator(), + base = jsDump.indent(), + inner = jsDump.indent(1); + if( arr.join ) + arr = arr.join( ',' + s + inner ); + if( !arr ) + return pre + post; + return [ pre, inner + arr, base + post ].join(s); + }; + function array( arr ){ + var i = arr.length, ret = Array(i); + this.up(); + while( i-- ) + ret[i] = this.parse( arr[i] ); + this.down(); + return join( '[', ret, ']' ); + }; + + var reName = /^function (\w+)/; + + var jsDump = window.jsDump = { + parse:function( obj, type ){//type is used mostly internally, you can fix a (custom)type in advance + var parser = this.parsers[ type || this.typeOf(obj) ]; + type = typeof parser; + + return type == 'function' ? parser.call( this, obj ) : + type == 'string' ? parser : + this.parsers.error; + }, + typeOf:function( obj ){ + var type = typeof obj, + f = 'function';//we'll use it 3 times, save it + return type != 'object' && type != f ? type : + !obj ? 'null' : + obj.exec ? 'regexp' :// some browsers (FF) consider regexps functions + obj.getHours ? 'date' : + obj.scrollBy ? 'window' : + obj.nodeName == '#document' ? 'document' : + obj.nodeName ? 'node' : + obj.item ? 'nodelist' : // Safari reports nodelists as functions + obj.callee ? 'arguments' : + obj.call || obj.constructor != Array && //an array would also fall on this hack + (obj+'').indexOf(f) != -1 ? f : //IE reports functions like alert, as objects + 'length' in obj ? 'array' : + type; + }, + separator:function(){ + return this.multiline ? this.HTML ? '
                        ' : '\n' : this.HTML ? ' ' : ' '; + }, + indent:function( extra ){// extra can be a number, shortcut for increasing-calling-decreasing + if( !this.multiline ) + return ''; + var chr = this.indentChar; + if( this.HTML ) + chr = chr.replace(/\t/g,' ').replace(/ /g,' '); + return Array( this._depth_ + (extra||0) ).join(chr); + }, + up:function( a ){ + this._depth_ += a || 1; + }, + down:function( a ){ + this._depth_ -= a || 1; + }, + setParser:function( name, parser ){ + this.parsers[name] = parser; + }, + // The next 3 are exposed so you can use them + quote:quote, + literal:literal, + join:join, + // + _depth_: 1, + // This is the list of parsers, to modify them, use jsDump.setParser + parsers:{ + window: '[Window]', + document: '[Document]', + error:'[ERROR]', //when no parser is found, shouldn't happen + unknown: '[Unknown]', + 'null':'null', + undefined:'undefined', + 'function':function( fn ){ + var ret = 'function', + name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE + if( name ) + ret += ' ' + name; + ret += '('; + + ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join(''); + return join( ret, this.parse(fn,'functionCode'), '}' ); + }, + array: array, + nodelist: array, + arguments: array, + object:function( map ){ + var ret = [ ]; + this.up(); + for( var key in map ) + ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) ); + this.down(); + return join( '{', ret, '}' ); + }, + node:function( node ){ + var open = this.HTML ? '<' : '<', + close = this.HTML ? '>' : '>'; + + var tag = node.nodeName.toLowerCase(), + ret = open + tag; + + for( var a in this.DOMAttrs ){ + var val = node[this.DOMAttrs[a]]; + if( val ) + ret += ' ' + a + '=' + this.parse( val, 'attribute' ); + } + return ret + close + open + '/' + tag + close; + }, + functionArgs:function( fn ){//function calls it internally, it's the arguments part of the function + var l = fn.length; + if( !l ) return ''; + + var args = Array(l); + while( l-- ) + args[l] = String.fromCharCode(97+l);//97 is 'a' + return ' ' + args.join(', ') + ' '; + }, + key:quote, //object calls it internally, the key part of an item in a map + functionCode:'[code]', //function calls it internally, it's the content of the function + attribute:quote, //node calls it internally, it's an html attribute value + string:quote, + date:quote, + regexp:literal, //regex + number:literal, + 'boolean':literal + }, + DOMAttrs:{//attributes to dump from nodes, name=>realName + id:'id', + name:'name', + 'class':'className' + }, + HTML:false,//if true, entities are escaped ( <, >, \t, space and \n ) + indentChar:' ',//indentation unit + multiline:true //if true, items in a collection, are separated by a \n, else just a space. + }; + +})(); diff --git a/test/qunit/testsuite.css b/test/qunit/testsuite.css index 2f5c4050c..dbfc43aee 100644 --- a/test/qunit/testsuite.css +++ b/test/qunit/testsuite.css @@ -1,120 +1,120 @@ -body, div, h1 { font-family: 'trebuchet ms', verdana, arial; margin: 0; padding: 0 } -body {font-size: 10pt; } -h1 { padding: 15px; font-size: large; background-color: #06b; color: white; } -h1 a { color: white; } -h2 { padding: 10px; background-color: #eee; color: black; margin: 0; font-size: small; font-weight: normal } - -.pass { color: green; } -.fail { color: red; } -p.result { margin-left: 1em; } - -#banner { height: 2em; border-bottom: 1px solid white; } -h2.pass { background-color: green; } -h2.fail { background-color: red; } - -div.testrunner-toolbar { background: #eee; border-top: 1px solid black; padding: 10px; } - -ol#tests > li > strong { cursor:pointer; } - -div#fx-tests h4 { - background: red; -} - -div#fx-tests h4.pass { - background: green; -} - -div#fx-tests div.box { - background: red url(data/cow.jpg) no-repeat; - overflow: hidden; - border: 2px solid #000; -} - -div#fx-tests div.overflow { - overflow: visible; -} - -div.inline { - display: inline; -} - -div.autoheight { - height: auto; -} - -div.autowidth { - width: auto; -} - -div.autoopacity { - opacity: auto; -} - -div.largewidth { - width: 100px; -} - -div.largeheight { - height: 100px; -} - -div.largeopacity { - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100); -} - -div.medwidth { - width: 50px; -} - -div.medheight { - height: 50px; -} - -div.medopacity { - opacity: 0.5; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50); -} - -div.nowidth { - width: 0px; -} - -div.noheight { - height: 0px; -} - -div.noopacity { - opacity: 0; - filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); -} - -div.hidden { - display: none; -} - -div#fx-tests div.widewidth { - background-repeat: repeat-x; -} - -div#fx-tests div.wideheight { - background-repeat: repeat-y; -} - -div#fx-tests div.widewidth.wideheight { - background-repeat: repeat; -} - -div#fx-tests div.noback { - background-image: none; -} - -div.chain, div.chain div { width: 100px; height: 20px; position: relative; float: left; } -div.chain div { position: absolute; top: 0px; left: 0px; } - -div.chain.test { background: red; } -div.chain.test div { background: green; } - -div.chain.out { background: green; } -div.chain.out div { background: red; display: none; } - -div#show-tests * { display: none; } +body, div, h1 { font-family: 'trebuchet ms', verdana, arial; margin: 0; padding: 0 } +body {font-size: 10pt; } +h1 { padding: 15px; font-size: large; background-color: #06b; color: white; } +h1 a { color: white; } +h2 { padding: 10px; background-color: #eee; color: black; margin: 0; font-size: small; font-weight: normal } + +.pass { color: green; } +.fail { color: red; } +p.result { margin-left: 1em; } + +#banner { height: 2em; border-bottom: 1px solid white; } +h2.pass { background-color: green; } +h2.fail { background-color: red; } + +div.testrunner-toolbar { background: #eee; border-top: 1px solid black; padding: 10px; } + +ol#tests > li > strong { cursor:pointer; } + +div#fx-tests h4 { + background: red; +} + +div#fx-tests h4.pass { + background: green; +} + +div#fx-tests div.box { + background: red url(data/cow.jpg) no-repeat; + overflow: hidden; + border: 2px solid #000; +} + +div#fx-tests div.overflow { + overflow: visible; +} + +div.inline { + display: inline; +} + +div.autoheight { + height: auto; +} + +div.autowidth { + width: auto; +} + +div.autoopacity { + opacity: auto; +} + +div.largewidth { + width: 100px; +} + +div.largeheight { + height: 100px; +} + +div.largeopacity { + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=100); +} + +div.medwidth { + width: 50px; +} + +div.medheight { + height: 50px; +} + +div.medopacity { + opacity: 0.5; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=50); +} + +div.nowidth { + width: 0px; +} + +div.noheight { + height: 0px; +} + +div.noopacity { + opacity: 0; + filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0); +} + +div.hidden { + display: none; +} + +div#fx-tests div.widewidth { + background-repeat: repeat-x; +} + +div#fx-tests div.wideheight { + background-repeat: repeat-y; +} + +div#fx-tests div.widewidth.wideheight { + background-repeat: repeat; +} + +div#fx-tests div.noback { + background-image: none; +} + +div.chain, div.chain div { width: 100px; height: 20px; position: relative; float: left; } +div.chain div { position: absolute; top: 0px; left: 0px; } + +div.chain.test { background: red; } +div.chain.test div { background: green; } + +div.chain.out { background: green; } +div.chain.out div { background: red; display: none; } + +div#show-tests * { display: none; } diff --git a/test/rules.js b/test/rules.js index 32886f559..dfb0bd356 100644 --- a/test/rules.js +++ b/test/rules.js @@ -1,267 +1,267 @@ -module("rules"); - -test("rules() - internal - input", function() { - var element = $('#firstname'); - var v = $('#testForm1').validate(); - same( element.rules(), { required: true, minlength: 2 } ); -}); - -test("rules(), ignore method:false", function() { - var element = $('#firstnamec'); - var v = $('#testForm1clean').validate({ - rules: { - firstname: { required: false, minlength: 2 } - } - }); - same( element.rules(), { minlength: 2 } ); -}); - -test("rules() - internal - select", function() { - var element = $('#meal'); - var v = $('#testForm3').validate(); - same( element.rules(), {required: true} ); -}); - -test("rules() - external", function() { - var element = $('#text1'); - var v = $('#form').validate({ - rules: { - action: {date: true, min: 5} - } - }); - same( element.rules(), {date: true, min: 5} ); -}); - -test("rules() - external - complete form", function() { - expect(1); - - var methods = $.extend({}, $.validator.methods); - var messages = $.extend({}, $.validator.messages); - - $.validator.addMethod("verifyTest", function() { - ok( true, "method executed" ); - return true; - }); - var v = $('#form').validate({ - rules: { - action: {verifyTest: true} - } - }); - v.form(); - - $.validator.methods = methods; - $.validator.messages = messages; -}); - -test("rules() - internal - input", function() { - var element = $('#form8input'); - var v = $('#testForm8').validate(); - same( element.rules(), {required: true, number: true, rangelength: [2, 8]}); -}); - -test("rules(), merge min/max to range, minlength/maxlength to rangelength", function() { - jQuery.validator.autoCreateRanges = true; - var v = $("#testForm1clean").validate({ - rules: { - firstname: { - min: 5, - max: 12 - }, - lastname: { - minlength: 2, - maxlength: 8 - } - } - }); - same( $("#firstnamec").rules(), {range: [5, 12]}); - - same( $("#lastnamec").rules(), {rangelength: [2, 8]} ); - jQuery.validator.autoCreateRanges = false; -}); - -test("rules(), gurantee that required is at front", function() { - $("#testForm1").validate(); - var v = $("#v2").validate(); - $("#subformRequired").validate(); - function flatRules(element) { - var result = []; - jQuery.each($(element).rules(), function(key, value) { result.push(key) }); - return result.join(" "); - } - equals( "required minlength", flatRules("#firstname") ); - equals( "required maxlength minlength", flatRules("#v2-i6") ); - equals( "required maxlength", flatRules("#co_name") ); - - reset(); - jQuery.validator.autoCreateRanges = true; - v = $("#v2").validate(); - equals( "required rangelength", flatRules("#v2-i6") ); - - $("#subformRequired").validate({ - rules: { - co_name: "required" - } - }); - $("#co_name").removeClass(); - equals( "required maxlength", flatRules("#co_name") ); - jQuery.validator.autoCreateRanges = false; -}); - -test("rules(), evaluate dynamic parameters", function() { - expect(2); - var v = $("#testForm1clean").validate({ - rules: { - firstname: { - min: function(element) { - equals( $("#firstnamec")[0], element ); - return 12; - } - } - } - }); - same( $("#firstnamec").rules(), {min:12}); -}); - -test("rules(), class and attribute combinations", function() { - - $.validator.addMethod("customMethod1", function() { - return false; - }, ""); - $.validator.addMethod("customMethod2", function() { - return false; - }, ""); - var v = $("#v2").validate({ - rules: { - 'v2-i7': { - required: true, - minlength: 2, - customMethod: true - } - } - }); - same( $("#v2-i1").rules(), { required: true }); - same( $("#v2-i2").rules(), { required: true, email: true }); - same( $("#v2-i3").rules(), { url: true }); - same( $("#v2-i4").rules(), { required: true, minlength: 2 }); - same( $("#v2-i5").rules(), { required: true, minlength: 2, maxlength: 5, customMethod1: "123" }); - jQuery.validator.autoCreateRanges = true; - same( $("#v2-i5").rules(), { required: true, customMethod1: "123", rangelength: [2, 5] }); - same( $("#v2-i6").rules(), { required: true, customMethod2: true, rangelength: [2, 5] }); - jQuery.validator.autoCreateRanges = false; - same( $("#v2-i7").rules(), { required: true, minlength: 2, customMethod: true }); - - delete $.validator.methods.customMethod1; - delete $.validator.messages.customMethod1; - delete $.validator.methods.customMethod2; - delete $.validator.messages.customMethod2; -}); - -test("rules(), dependency checks", function() { - var v = $("#testForm1clean").validate({ - rules: { - firstname: { - min: { - param: 5, - depends: function(el) { - return /^a/.test($(el).val()); - } - } - }, - lastname: { - max: { - param: 12 - }, - email: { - depends: function() { return true; } - } - } - } - }); - - var rules = $("#firstnamec").rules(); - equals( 0, v.objectLength(rules) ); - - $("#firstnamec").val('ab'); - same( $("#firstnamec").rules(), {min:5}); - - same( $("#lastnamec").rules(), {max:12, email:true}); -}); - -test("rules(), add and remove", function() { - $.validator.addMethod("customMethod1", function() { - return false; - }, ""); - $("#v2").validate(); - var removedAttrs = $("#v2-i5").removeClass("required").removeAttrs("minlength maxlength"); - same( $("#v2-i5").rules(), { customMethod1: "123" }); - - $("#v2-i5").addClass("required").attr(removedAttrs); - same( $("#v2-i5").rules(), { required: true, minlength: 2, maxlength: 5, customMethod1: "123" }); - - $("#v2-i5").addClass("email").attr({min: 5}); - same( $("#v2-i5").rules(), { required: true, email: true, minlength: 2, maxlength: 5, min: 5, customMethod1: "123" }); - - $("#v2-i5").removeClass("required email").removeAttrs("minlength maxlength customMethod1 min"); - same( $("#v2-i5").rules(), {}); - - delete $.validator.methods.customMethod1; - delete $.validator.messages.customMethod1; -}); - -test("rules(), add and remove static rules", function() { - var v = $("#testForm1clean").validate({ - rules: { - firstname: "required date" - } - }); - same( $("#firstnamec").rules(), { required: true, date: true } ); - - $("#firstnamec").rules("remove", "date") - same( $("#firstnamec").rules(), { required: true } ); - $("#firstnamec").rules("add", "email"); - same( $("#firstnamec").rules(), { required: true, email: true } ); - - $("#firstnamec").rules("remove", "required"); - same( $("#firstnamec").rules(), { email: true } ); - - same( $("#firstnamec").rules("remove"), { email: true } ); - same( $("#firstnamec").rules(), { } ); - - $("#firstnamec").rules("add", "required email"); - same( $("#firstnamec").rules(), { required: true, email: true } ); - - - same( $("#lastnamec").rules(), {} ); - $("#lastnamec").rules("add", "required"); - $("#lastnamec").rules("add", { - minlength: 2 - }); - same( $("#lastnamec").rules(), { required: true, minlength: 2 } ); - - - var removedRules = $("#lastnamec").rules("remove", "required email"); - same( $("#lastnamec").rules(), { minlength: 2 } ); - $("#lastnamec").rules("add", removedRules); - same( $("#lastnamec").rules(), { required: true, minlength: 2 } ); -}); - -test("rules(), add messages", function() { - $("#firstnamec").attr("title", null); - var v = $("#testForm1clean").validate({ - rules: { - firstname: "required" - } - }); - $("#testForm1clean").valid(); - $("#firstnamec").valid(); - same( v.settings.messages.firstname, undefined ); - - $("#firstnamec").rules("add", { - messages: { - required: "required" - } - }); - - $("#firstnamec").valid(); - same( v.errorList[0] && v.errorList[0].message, "required" ); -}); +module("rules"); + +test("rules() - internal - input", function() { + var element = $('#firstname'); + var v = $('#testForm1').validate(); + same( element.rules(), { required: true, minlength: 2 } ); +}); + +test("rules(), ignore method:false", function() { + var element = $('#firstnamec'); + var v = $('#testForm1clean').validate({ + rules: { + firstname: { required: false, minlength: 2 } + } + }); + same( element.rules(), { minlength: 2 } ); +}); + +test("rules() - internal - select", function() { + var element = $('#meal'); + var v = $('#testForm3').validate(); + same( element.rules(), {required: true} ); +}); + +test("rules() - external", function() { + var element = $('#text1'); + var v = $('#form').validate({ + rules: { + action: {date: true, min: 5} + } + }); + same( element.rules(), {date: true, min: 5} ); +}); + +test("rules() - external - complete form", function() { + expect(1); + + var methods = $.extend({}, $.validator.methods); + var messages = $.extend({}, $.validator.messages); + + $.validator.addMethod("verifyTest", function() { + ok( true, "method executed" ); + return true; + }); + var v = $('#form').validate({ + rules: { + action: {verifyTest: true} + } + }); + v.form(); + + $.validator.methods = methods; + $.validator.messages = messages; +}); + +test("rules() - internal - input", function() { + var element = $('#form8input'); + var v = $('#testForm8').validate(); + same( element.rules(), {required: true, number: true, rangelength: [2, 8]}); +}); + +test("rules(), merge min/max to range, minlength/maxlength to rangelength", function() { + jQuery.validator.autoCreateRanges = true; + var v = $("#testForm1clean").validate({ + rules: { + firstname: { + min: 5, + max: 12 + }, + lastname: { + minlength: 2, + maxlength: 8 + } + } + }); + same( $("#firstnamec").rules(), {range: [5, 12]}); + + same( $("#lastnamec").rules(), {rangelength: [2, 8]} ); + jQuery.validator.autoCreateRanges = false; +}); + +test("rules(), gurantee that required is at front", function() { + $("#testForm1").validate(); + var v = $("#v2").validate(); + $("#subformRequired").validate(); + function flatRules(element) { + var result = []; + jQuery.each($(element).rules(), function(key, value) { result.push(key) }); + return result.join(" "); + } + equals( "required minlength", flatRules("#firstname") ); + equals( "required maxlength minlength", flatRules("#v2-i6") ); + equals( "required maxlength", flatRules("#co_name") ); + + reset(); + jQuery.validator.autoCreateRanges = true; + v = $("#v2").validate(); + equals( "required rangelength", flatRules("#v2-i6") ); + + $("#subformRequired").validate({ + rules: { + co_name: "required" + } + }); + $("#co_name").removeClass(); + equals( "required maxlength", flatRules("#co_name") ); + jQuery.validator.autoCreateRanges = false; +}); + +test("rules(), evaluate dynamic parameters", function() { + expect(2); + var v = $("#testForm1clean").validate({ + rules: { + firstname: { + min: function(element) { + equals( $("#firstnamec")[0], element ); + return 12; + } + } + } + }); + same( $("#firstnamec").rules(), {min:12}); +}); + +test("rules(), class and attribute combinations", function() { + + $.validator.addMethod("customMethod1", function() { + return false; + }, ""); + $.validator.addMethod("customMethod2", function() { + return false; + }, ""); + var v = $("#v2").validate({ + rules: { + 'v2-i7': { + required: true, + minlength: 2, + customMethod: true + } + } + }); + same( $("#v2-i1").rules(), { required: true }); + same( $("#v2-i2").rules(), { required: true, email: true }); + same( $("#v2-i3").rules(), { url: true }); + same( $("#v2-i4").rules(), { required: true, minlength: 2 }); + same( $("#v2-i5").rules(), { required: true, minlength: 2, maxlength: 5, customMethod1: "123" }); + jQuery.validator.autoCreateRanges = true; + same( $("#v2-i5").rules(), { required: true, customMethod1: "123", rangelength: [2, 5] }); + same( $("#v2-i6").rules(), { required: true, customMethod2: true, rangelength: [2, 5] }); + jQuery.validator.autoCreateRanges = false; + same( $("#v2-i7").rules(), { required: true, minlength: 2, customMethod: true }); + + delete $.validator.methods.customMethod1; + delete $.validator.messages.customMethod1; + delete $.validator.methods.customMethod2; + delete $.validator.messages.customMethod2; +}); + +test("rules(), dependency checks", function() { + var v = $("#testForm1clean").validate({ + rules: { + firstname: { + min: { + param: 5, + depends: function(el) { + return /^a/.test($(el).val()); + } + } + }, + lastname: { + max: { + param: 12 + }, + email: { + depends: function() { return true; } + } + } + } + }); + + var rules = $("#firstnamec").rules(); + equals( 0, v.objectLength(rules) ); + + $("#firstnamec").val('ab'); + same( $("#firstnamec").rules(), {min:5}); + + same( $("#lastnamec").rules(), {max:12, email:true}); +}); + +test("rules(), add and remove", function() { + $.validator.addMethod("customMethod1", function() { + return false; + }, ""); + $("#v2").validate(); + var removedAttrs = $("#v2-i5").removeClass("required").removeAttrs("minlength maxlength"); + same( $("#v2-i5").rules(), { customMethod1: "123" }); + + $("#v2-i5").addClass("required").attr(removedAttrs); + same( $("#v2-i5").rules(), { required: true, minlength: 2, maxlength: 5, customMethod1: "123" }); + + $("#v2-i5").addClass("email").attr({min: 5}); + same( $("#v2-i5").rules(), { required: true, email: true, minlength: 2, maxlength: 5, min: 5, customMethod1: "123" }); + + $("#v2-i5").removeClass("required email").removeAttrs("minlength maxlength customMethod1 min"); + same( $("#v2-i5").rules(), {}); + + delete $.validator.methods.customMethod1; + delete $.validator.messages.customMethod1; +}); + +test("rules(), add and remove static rules", function() { + var v = $("#testForm1clean").validate({ + rules: { + firstname: "required date" + } + }); + same( $("#firstnamec").rules(), { required: true, date: true } ); + + $("#firstnamec").rules("remove", "date") + same( $("#firstnamec").rules(), { required: true } ); + $("#firstnamec").rules("add", "email"); + same( $("#firstnamec").rules(), { required: true, email: true } ); + + $("#firstnamec").rules("remove", "required"); + same( $("#firstnamec").rules(), { email: true } ); + + same( $("#firstnamec").rules("remove"), { email: true } ); + same( $("#firstnamec").rules(), { } ); + + $("#firstnamec").rules("add", "required email"); + same( $("#firstnamec").rules(), { required: true, email: true } ); + + + same( $("#lastnamec").rules(), {} ); + $("#lastnamec").rules("add", "required"); + $("#lastnamec").rules("add", { + minlength: 2 + }); + same( $("#lastnamec").rules(), { required: true, minlength: 2 } ); + + + var removedRules = $("#lastnamec").rules("remove", "required email"); + same( $("#lastnamec").rules(), { minlength: 2 } ); + $("#lastnamec").rules("add", removedRules); + same( $("#lastnamec").rules(), { required: true, minlength: 2 } ); +}); + +test("rules(), add messages", function() { + $("#firstnamec").attr("title", null); + var v = $("#testForm1clean").validate({ + rules: { + firstname: "required" + } + }); + $("#testForm1clean").valid(); + $("#firstnamec").valid(); + same( v.settings.messages.firstname, undefined ); + + $("#firstnamec").rules("add", { + messages: { + required: "required" + } + }); + + $("#firstnamec").valid(); + same( v.errorList[0] && v.errorList[0].message, "required" ); +}); diff --git a/test/test.js b/test/test.js index bbd570d1f..895380849 100644 --- a/test/test.js +++ b/test/test.js @@ -1,1089 +1,1089 @@ -jQuery.validator.defaults.debug = true; - -module("validator"); - -test("Constructor", function() { - var v1 = $("#testForm1").validate(); - var v2 = $("#testForm1").validate(); - equals( v1, v2, "Calling validate() multiple times must return the same validator instance" ); - equals( v1.elements().length, 3, "validator elements" ); -}); - -test("validate() without elements, with non-form elements", function() { - $("#doesn'texist").validate(); -}); - -test("valid() plugin method", function() { - var form = $("#userForm"); - form.validate(); - ok ( !form.valid(), "Form isn't valid yet" ); - var input = $("#username"); - ok ( !input.valid(), "Input isn't valid either" ); - input.val("Hello world"); - ok ( form.valid(), "Form is now valid" ); - ok ( input.valid(), "Input is valid, too" ); -}); - -test("valid() plugin method", function() { - var form = $("#testForm1"); - form.validate(); - var inputs = form.find("input"); - ok( !inputs.valid(), "all invalid" ); - inputs.not(":first").val("ok"); - ok( !inputs.valid(), "just one invalid" ); - inputs.val("ok"); - ok( inputs.valid(), "all valid" ); -}); - -test("valid() plugin method, special handling for checkable groups", function() { - // rule is defined on first checkbox, must apply to others, too - var checkable = $("#checkable2"); - ok( !checkable.valid(), "must be invalid, not checked yet" ); - checkable.attr("checked", true); - ok( checkable.valid(), "valid, is now checked" ); - checkable.attr("checked", false); - ok( !checkable.valid(), "invalid again" ); - $("#checkable3").attr("checked", true); - ok( checkable.valid(), "valid, third box is checked" ); -}); - -test("addMethod", function() { - expect( 3 ); - $.validator.addMethod("hi", function(value) { - return value == "hi"; - }, "hi me too"); - var method = $.validator.methods.hi, - e = $('#text1')[0]; - ok( !method(e.value, e), "Invalid" ); - e.value = "hi"; - ok( method(e.value, e), "Invalid" ); - ok( jQuery.validator.messages.hi == "hi me too", "Check custom message" ); -}); - -test("addMethod2", function() { - expect( 4 ); - $.validator.addMethod("complicatedPassword", function(value, element, param) { - return this.optional(element) || /\D/.test(value) && /\d/.test(value) - }, "Your password must contain at least one number and one letter"); - var v = jQuery("#form").validate({ - rules: { - action: { complicatedPassword: true } - } - }); - var rule = $.validator.methods.complicatedPassword, - e = $('#text1')[0]; - e.value = ""; - ok( v.element(e) === undefined, "Rule is optional, valid" ); - equals( 0, v.size() ); - e.value = "ko"; - ok( !v.element(e), "Invalid, doesn't contain one of the required characters" ); - e.value = "ko1"; - ok( v.element(e) ); -}); - -test("form(): simple", function() { - expect( 2 ); - var form = $('#testForm1')[0]; - var v = $(form).validate(); - ok( !v.form(), 'Invalid form' ); - $('#firstname').val("hi"); - $('#lastname').val("hi"); - ok( v.form(), 'Valid form' ); -}); - -test("form(): checkboxes: min/required", function() { - expect( 3 ); - var form = $('#testForm6')[0]; - var v = $(form).validate(); - ok( !v.form(), 'Invalid form' ); - $('#form6check1').attr("checked", true); - ok( !v.form(), 'Invalid form' ); - $('#form6check2').attr("checked", true); - ok( v.form(), 'Valid form' ); -}); -test("form(): selects: min/required", function() { - expect( 3 ); - var form = $('#testForm7')[0]; - var v = $(form).validate(); - ok( !v.form(), 'Invalid form' ); - $("#optionxa").attr("selected", true); - ok( !v.form(), 'Invalid form' ); - $("#optionxb").attr("selected", true); - ok( v.form(), 'Valid form' ); -}); - -test("form(): with equalTo", function() { - expect( 2 ); - var form = $('#testForm5')[0]; - var v = $(form).validate(); - ok( !v.form(), 'Invalid form' ); - $('#x1, #x2').val("hi"); - ok( v.form(), 'Valid form' ); -}); - -test("check(): simple", function() { - expect( 3 ); - var element = $('#firstname')[0]; - var v = $('#testForm1').validate(); - ok( v.size() == 0, 'No errors yet' ); - v.check(element); - ok( v.size() == 1, 'error exists' ); - v.errorList = []; - $('#firstname').val("hi"); - v.check(element); - ok( !v.size() == 1, 'No more errors' ); -}); - -test("hide(): input", function() { - expect( 3 ); - var errorLabel = $('#errorFirstname'); - var element = $('#firstname')[0]; - element.value ="bla"; - var v = $('#testForm1').validate(); - errorLabel.show(); - ok( errorLabel.is(":visible"), "Error label visible before validation" ); - ok( v.element(element) ); - ok( errorLabel.is(":hidden"), "Error label not visible after validation" ); -}); - -test("hide(): radio", function() { - expect( 2 ); - var errorLabel = $('#agreeLabel'); - var element = $('#agb')[0]; - element.checked = true; - var v = $('#testForm2').validate({ errorClass: "xerror" }); - errorLabel.show(); - ok( errorLabel.is(":visible"), "Error label visible after validation" ); - v.element(element); - ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); -}); - -test("hide(): errorWrapper", function() { - expect(2); - var errorLabel = $('#errorWrapper'); - var element = $('#meal')[0]; - element.selectedIndex = 1; - - errorLabel.show(); - ok( errorLabel.is(":visible"), "Error label visible after validation" ); - var v = $('#testForm3').validate({ wrapper: "li", errorLabelContainer: $("#errorContainer") }); - v.element(element); - ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); -}); - -test("hide(): container", function() { - expect(4); - var errorLabel = $('#errorContainer'); - var element = $('#testForm3')[0]; - var v = $('#testForm3').validate({ errorWrapper: "li", errorContainer: $("#errorContainer") }); - v.form(); - ok( errorLabel.is(":visible"), "Error label visible after validation" ); - $('#meal')[0].selectedIndex = 1; - v.form(); - ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); - $('#meal')[0].selectedIndex = -1; - v.element("#meal"); - ok( errorLabel.is(":visible"), "Error label visible after validation" ); - $('#meal')[0].selectedIndex = 1; - v.element("#meal"); - ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); -}); - -test("valid()", function() { - expect(4); - var errorList = [{name:"meal",message:"foo", element:$("#meal")[0]}]; - var v = $('#testForm3').validate(); - ok( v.valid(), "No errors, must be valid" ); - v.errorList = errorList; - ok( !v.valid(), "One error, must be invalid" ); - reset(); - v = $('#testForm3').validate({ submitHandler: function() { - ok( false, "Submit handler was called" ); - }}); - ok( v.valid(), "No errors, must be valid and returning true, even with the submit handler" ); - v.errorList = errorList; - ok( !v.valid(), "One error, must be invalid, no call to submit handler" ); -}); - -test("submitHandler keeps submitting button", function() { - $("#userForm").validate({ - debug: true, - submitHandler: function(form) { - // dunno how to test this better; this tests the implementation that uses a hidden input - var hidden = $(form).find("input:hidden")[0]; - same(hidden.value, button.value) - same(hidden.name, button.name) - } - }); - $("#username").val("bla"); - var button = $("#userForm :submit")[0] - $(button).triggerHandler("click"); - $("#userForm").submit(); -}); - -test("showErrors()", function() { - expect( 4 ); - var errorLabel = $('#errorFirstname').hide(); - var element = $('#firstname')[0]; - var v = $('#testForm1').validate(); - ok( errorLabel.is(":hidden") ); - equals( 0, $("label.error[for=lastname]").size() ); - v.showErrors({"firstname": "required", "lastname": "bla"}); - equals( true, errorLabel.is(":visible") ); - equals( true, $("label.error[for=lastname]").is(":visible") ); -}); - -test("showErrors(), allow empty string and null as default message", function() { - $("#userForm").validate({ - rules: { - username: { - required: true, - minlength: 3 - } - }, - messages: { - username: { - required: "", - minlength: "too short" - } - } - }); - ok( !$("#username").valid() ); - equals( "", $("label.error[for=username]").text() ); - - $("#username").val("ab"); - ok( !$("#username").valid() ); - equals( "too short", $("label.error[for=username]").text() ); - - $("#username").val("abc"); - ok( $("#username").valid() ); - ok( $("label.error[for=username]").is(":hidden") ); -}); - -test("showErrors() - external messages", function() { - expect( 4 ); - var methods = $.extend({}, $.validator.methods); - var messages = $.extend({}, $.validator.messages); - $.validator.addMethod("foo", function() { return false; }); - $.validator.addMethod("bar", function() { return false; }); - equals( 0, $("#testForm4 label.error[for=f1]").size() ); - equals( 0, $("#testForm4 label.error[for=f2]").size() ); - var form = $('#testForm4')[0]; - var v = $(form).validate({ - messages: { - f1: "Please!", - f2: "Wohoo!" - } - }); - v.form(); - equals( $("#testForm4 label.error[for=f1]").text(), "Please!" ); - equals( $("#testForm4 label.error[for=f2]").text(), "Wohoo!" ); - - $.validator.methods = methods; - $.validator.messages = messages; -}); - -test("showErrors() - custom handler", function() { - expect(5); - var v = $('#testForm1').validate({ - showErrors: function(errorMap, errorList) { - equals( v, this ); - equals( v.errorList, errorList ); - equals( v.errorMap, errorMap ); - equals( "buga", errorMap.firstname ); - equals( "buga", errorMap.lastname ); - } - }); - v.form(); -}); - -test("option: (un)highlight, default", function() { - $("#testForm1").validate(); - var e = $("#firstname") - ok( !e.hasClass("error") ); - ok( !e.hasClass("valid") ); - e.valid() - ok( e.hasClass("error") ); - ok( !e.hasClass("valid") ); - e.val("hithere").valid() - ok( !e.hasClass("error") ); - ok( e.hasClass("valid") ); -}); - -test("option: (un)highlight, nothing", function() { - expect(3); - $("#testForm1").validate({ - highlight: false, - unhighlight: false - }); - var e = $("#firstname") - ok( !e.hasClass("error") ); - e.valid() - ok( !e.hasClass("error") ); - e.valid() - ok( !e.hasClass("error") ); -}); - -test("option: (un)highlight, custom", function() { - expect(5); - $("#testForm1clean").validate({ - highlight: function(element, errorClass) { - equals( "invalid", errorClass ); - $(element).hide(); - }, - unhighlight: function(element, errorClass) { - equals( "invalid", errorClass ) - $(element).show(); - }, - errorClass: "invalid", - rules: { - firstname: "required" - } - }); - var e = $("#firstnamec") - ok( e.is(":visible") ); - e.valid() - ok( !e.is(":visible") ); - e.val("hithere").valid() - ok( e.is(":visible") ); -}); - -test("option: (un)highlight, custom2", function() { - expect(6); - $("#testForm1").validate({ - highlight: function(element, errorClass) { - $(element).addClass(errorClass); - $(element.form).find("label[for=" + element.id + "]").addClass(errorClass); - }, - unhighlight: function(element, errorClass) { - $(element).removeClass(errorClass); - $(element.form).find("label[for=" + element.id + "]").removeClass(errorClass); - }, - errorClass: "invalid" - }); - var e = $("#firstname") - var l = $("#errorFirstname") - ok( !e.is(".invalid") ); - ok( !l.is(".invalid") ); - e.valid() - ok( e.is(".invalid") ); - ok( l.is(".invalid") ); - e.val("hithere").valid() - ok( !e.is(".invalid") ); - ok( !l.is(".invalid") ); -}); - -test("elements() order", function() { - var container = $("#orderContainer"); - var v = $("#elementsOrder").validate({ - errorLabelContainer: container, - wrap: "li" - }); - isSet( v.elements().get(), q("order1", "order2", "order3", "order4", "order5", "order6"), "elements must be in document order" ); - v.form(); - same( container.children().map(function() { - return $(this).attr("for"); - }).get(), ["order1", "order2", "order3", "order4", "order5", "order6"], "labels in error container must be in document order" ); -}); - -test("defaultMessage(), empty title is ignored", function() { - var v = $("#userForm").validate(); - equals( "This field is required.", v.defaultMessage($("#username")[0], "required") ); -}); - -test("formatAndAdd", function() { - expect(4); - var v = $("#form").validate(); - var fakeElement = { form: $("#form")[0], name: "bar" }; - v.formatAndAdd(fakeElement, {method: "maxlength", parameters: 2}) - equals( "Please enter no more than 2 characters.", v.errorList[0].message ); - equals( "bar", v.errorList[0].element.name ); - - v.formatAndAdd(fakeElement, {method: "range", parameters:[2,4]}) - equals( "Please enter a value between 2 and 4.", v.errorList[1].message ); - - v.formatAndAdd(fakeElement, {method: "range", parameters:[0,4]}) - equals( "Please enter a value between 0 and 4.", v.errorList[2].message ); -}); - -test("formatAndAdd2", function() { - expect(3); - var v = $("#form").validate(); - var fakeElement = { form: $("#form")[0], name: "bar" }; - jQuery.validator.messages.test1 = function(param, element) { - equals( v, this ); - equals( 0, param ); - return "element " + element.name + " is not valid"; - }; - v.formatAndAdd(fakeElement, {method: "test1", parameters: 0}) - equals( "element bar is not valid", v.errorList[0].message ); -}); - -test("formatAndAdd, auto detect substitution string", function() { - var v = $("#testForm1clean").validate({ - rules: { - firstname: { - required: true, - rangelength: [5, 10] - } - }, - messages: { - firstname: { - rangelength: "at least ${0}, up to {1}" - } - } - }); - $("#firstnamec").val("abc"); - v.form(); - equals( "at least 5, up to 10", v.errorList[0].message ); -}) - -test("error containers, simple", function() { - expect(14); - var container = $("#simplecontainer"); - var v = $("#form").validate({ - errorLabelContainer: container, - showErrors: function() { - container.find("h3").html( jQuery.validator.format("There are {0} errors in your form.", this.size()) ); - this.defaultShowErrors(); - } - }); - - v.prepareForm(); - ok( v.valid(), "form is valid" ); - equals( 0, container.find("label").length, "There should be no error labels" ); - equals( "", container.find("h3").html() ); - - v.prepareForm(); - v.errorList = [{message:"bar", element: {name:"foo"}}, {message: "necessary", element: {name:"required"}}]; - ok( !v.valid(), "form is not valid after adding errors manually" ); - v.showErrors(); - equals( container.find("label").length, 2, "There should be two error labels" ); - ok( container.is(":visible"), "Check that the container is visible" ); - container.find("label").each(function() { - ok( $(this).is(":visible"), "Check that each label is visible" ); - }); - equals( "There are 2 errors in your form.", container.find("h3").html() ); - - v.prepareForm(); - ok( v.valid(), "form is valid after a reset" ); - v.showErrors(); - equals( container.find("label").length, 2, "There should still be two error labels" ); - ok( container.is(":hidden"), "Check that the container is hidden" ); - container.find("label").each(function() { - ok( $(this).is(":hidden"), "Check that each label is hidden" ); - }); -}); - -test("error containers, with labelcontainer I", function() { - expect(16); - var container = $("#container"), - labelcontainer = $("#labelcontainer"); - var v = $("#form").validate({ - errorContainer: container, - errorLabelContainer: labelcontainer, - wrapper: "li" - }); - - ok( v.valid(), "form is valid" ); - equals( 0, container.find("label").length, "There should be no error labels in the container" ); - equals( 0, labelcontainer.find("label").length, "There should be no error labels in the labelcontainer" ); - equals( 0, labelcontainer.find("li").length, "There should be no lis labels in the labelcontainer" ); - - v.errorList = [{message:"bar", element: {name:"foo"}}, {name: "required", message: "necessary", element: {name:"required"}}]; - ok( !v.valid(), "form is not valid after adding errors manually" ); - v.showErrors(); - equals( 0, container.find("label").length, "There should be no error label in the container" ); - equals( 2, labelcontainer.find("label").length, "There should be two error labels in the labelcontainer" ); - equals( 2, labelcontainer.find("li").length, "There should be two error lis in the labelcontainer" ); - ok( container.is(":visible"), "Check that the container is visible" ); - ok( labelcontainer.is(":visible"), "Check that the labelcontainer is visible" ); - var labels = labelcontainer.find("label").each(function() { - ok( $(this).is(":visible"), "Check that each label is visible1" ); - equals( "li", $(this).parent()[0].tagName.toLowerCase(), "Check that each label is wrapped in an li" ); - ok( $(this).parent("li").is(":visible"), "Check that each parent li is visible" ); - }); -}); - -test("errorcontainer, show/hide only on submit", function() { - expect(14); - var container = $("#container"); - var labelContainer = $("#labelcontainer"); - var v = $("#testForm1").bind("invalid-form.validate", function() { - ok( true, "invalid-form event triggered called" ); - }).validate({ - errorContainer: container, - errorLabelContainer: labelContainer, - showErrors: function() { - container.html( jQuery.validator.format("There are {0} errors in your form.", this.numberOfInvalids()) ); - ok( true, "showErrors called" ); - this.defaultShowErrors(); - } - }); - equals( "", container.html(), "must be empty" ); - equals( "", labelContainer.html(), "must be empty" ); - // validate whole form, both showErrors and invalidHandler must be called once - // preferably invalidHandler first, showErrors second - ok( !v.form(), "invalid form" ); - equals( 2, labelContainer.find("label").length ); - equals( "There are 2 errors in your form.", container.html() ); - ok( labelContainer.is(":visible"), "must be visible" ); - ok( container.is(":visible"), "must be visible" ); - - $("#firstname").val("hix").keyup(); - $("#testForm1").triggerHandler("keyup", [jQuery.event.fix({ type: "keyup", target: $("#firstname")[0] })]); - equals( 1, labelContainer.find("label:visible").length ); - equals( "There are 1 errors in your form.", container.html() ); - - $("#lastname").val("abc"); - ok( v.form(), "Form now valid, trigger showErrors but not invalid-form" ); -}); - -test("option invalidHandler", function() { - expect(1); - var v = $("#testForm1clean").validate({ - invalidHandler: function() { - ok( true, "invalid-form event triggered called" ); - start(); - } - }); - $("#usernamec").val("asdf").rules("add", { required: true, remote: "users.php" }); - stop(); - $("#testForm1clean").submit(); -}); - -test("findByName()", function() { - isSet( new $.validator({}, document.getElementById("form")).findByName(document.getElementById("radio1").name), $("#form").find("[name=radio1]") ); -}); - -test("focusInvalid()", function() { - expect(1); - var inputs = $("#testForm1 input").focus(function() { - equals( inputs[0], this, "focused first element" ); - }); - var v = $("#testForm1").validate(); - v.form(); - // have to explicitly show input elements with error class, they are hidden by testsuite styles - inputs.show(); - v.focusInvalid(); -}); - -test("findLastActive()", function() { - expect(3); - var v = $("#testForm1").validate(); - ok( !v.findLastActive() ); - v.form(); - v.focusInvalid(); - equals( v.findLastActive(), $("#firstname")[0] ); - var lastActive = $("#lastname").trigger("focus").trigger("focusin")[0]; - equals( v.lastActive, lastActive ); -}); - -test("validating multiple checkboxes with 'required'", function() { - expect(3); - var checkboxes = $("#form input[name=check3]").attr("checked", false); - equals(5, checkboxes.size()); - var v = $("#form").validate({ - rules: { - check3: "required" - } - }); - v.form(); - equals(1, v.size()); - checkboxes.filter(":last").attr("checked", true); - v.form(); - equals(0, v.size()); -}); - -test("dynamic form", function() { - var counter = 0; - function add() { - $("").appendTo("#testForm2"); - } - function errors(expected, message) { - equals(expected, v.size(), message ); - } - var v = $("#testForm2").validate(); - v.form(); - errors(1); - add(); - v.form(); - errors(2); - add(); - v.form(); - errors(3); - $("#testForm2 input[name=list1]").remove(); - v.form(); - errors(2); - add(); - v.form(); - errors(3); - $("#testForm2 input[name^=list]").remove(); - v.form(); - errors(1); - $("#agb").attr("disabled", true); - v.form(); - errors(0); - $("#agb").attr("disabled", false); - v.form(); - errors(1); -}); - -test("idOrName()", function() { - expect(4); - var v = $("#testForm1").validate(); - equals( "form8input", v.idOrName( $("#form8input")[0] ) ); - equals( "check", v.idOrName( $("#form6check1")[0] ) ); - equals( "agree", v.idOrName( $("#agb")[0] ) ); - equals( "button", v.idOrName( $("#form :button")[0] ) ); -}); - -test("resetForm()", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - var v = $("#testForm1").validate(); - v.form(); - errors(2); - $("#firstname").val("hiy"); - v.resetForm(); - errors(0); - equals("", $("#firstname").val(), "form plugin is included, therefor resetForm must also reset inputs, not only errors"); -}); - -test("message from title", function() { - var v = $("#withTitle").validate(); - v.checkForm(); - equals(v.errorList[0].message, "fromtitle", "title not used"); -}); - -test("ignoreTitle", function() { - var v = $("#withTitle").validate({ignoreTitle:true}); - v.checkForm(); - equals(v.errorList[0].message, $.validator.messages["required"], "title used when it should have been ignored"); -}); - -test("ajaxSubmit", function() { - expect(1); - stop(); - $("#user").val("Peter"); - $("#password").val("foobar"); - jQuery("#signupForm").validate({ - submitHandler: function(form) { - jQuery(form).ajaxSubmit({ - success: function(response) { - equals("Hi Peter, welcome back.", response); - start(); - } - }); - } - }); - jQuery("#signupForm").triggerHandler("submit"); -}); - - -module("misc"); - -test("success option", function() { - expect(7); - equals( "", $("#firstname").val() ); - var v = $("#testForm1").validate({ - success: "valid" - }); - var label = $("#testForm1 label"); - ok( label.is(".error") ); - ok( !label.is(".valid") ); - v.form(); - ok( label.is(".error") ); - ok( !label.is(".valid") ); - $("#firstname").val("hi"); - v.form(); - ok( label.is(".error") ); - ok( label.is(".valid") ); -}); - -test("success option2", function() { - expect(5); - equals( "", $("#firstname").val() ); - var v = $("#testForm1").validate({ - success: "valid" - }); - var label = $("#testForm1 label"); - ok( label.is(".error") ); - ok( !label.is(".valid") ); - $("#firstname").val("hi"); - v.form(); - ok( label.is(".error") ); - ok( label.is(".valid") ); -}); - -test("success option3", function() { - expect(5); - equals( "", $("#firstname").val() ); - $("#errorFirstname").remove(); - var v = $("#testForm1").validate({ - success: "valid" - }); - equals( 0, $("#testForm1 label").size() ); - $("#firstname").val("hi"); - v.form(); - var labels = $("#testForm1 label"); - equals( 3, labels.size() ); - ok( labels.eq(0).is(".valid") ); - ok( !labels.eq(1).is(".valid") ); -}); - -test("successlist", function() { - var v = $("#form").validate({ success: "xyz" }); - v.form(); - equals(0, v.successList.length); -}); - -test("success isn't called for optional elements", function() { - expect(4); - equals( "", $("#firstname").removeClass().val() ); - $("#something").remove(); - $("#lastname").remove(); - $("#errorFirstname").remove(); - var v = $("#testForm1").validate({ - success: function() { - ok( false, "don't call success for optional elements!" ); - }, - rules: { - firstname: "email" - } - }); - equals( 0, $("#testForm1 label").size() ); - v.form(); - equals( 0, $("#testForm1 label").size() ); - $("#firstname").valid(); - equals( 0, $("#testForm1 label").size() ); -}); - -test("all rules are evaluated even if one returns a dependency-mistmatch", function() { - expect(6); - equals( "", $("#firstname").removeClass().val() ); - $("#lastname").remove(); - $("#errorFirstname").remove(); - $.validator.addMethod("custom1", function() { - ok( true, "custom method must be evaluated" ); - return true; - }, ""); - var v = $("#testForm1").validate({ - rules: { - firstname: {email:true, custom1: true} - } - }); - equals( 0, $("#testForm1 label").size() ); - v.form(); - equals( 0, $("#testForm1 label").size() ); - $("#firstname").valid(); - equals( 0, $("#testForm1 label").size() ); - - delete $.validator.methods.custom1; - delete $.validator.messages.custom1; -}); - -test("messages", function() { - var m = jQuery.validator.messages; - equals( "Please enter no more than 0 characters.", m.maxlength(0) ); - equals( "Please enter at least 1 characters.", m.minlength(1) ); - equals( "Please enter a value between 1 and 2 characters long.", m.rangelength([1, 2]) ); - equals( "Please enter a value less than or equal to 1.", m.max(1) ); - equals( "Please enter a value greater than or equal to 0.", m.min(0) ); - equals( "Please enter a value between 1 and 2.", m.range([1, 2]) ); -}); - -test("jQuery.validator.format", function() { - equals( "Please enter a value between 0 and 1.", jQuery.validator.format("Please enter a value between {0} and {1}.", 0, 1) ); - equals( "0 is too fast! Enter a value smaller then 0 and at least -15", jQuery.validator.format("{0} is too fast! Enter a value smaller then {0} and at least {1}", 0, -15) ); - var template = jQuery.validator.format("{0} is too fast! Enter a value smaller then {0} and at least {1}"); - equals( "0 is too fast! Enter a value smaller then 0 and at least -15", template(0, -15) ); - template = jQuery.validator.format("Please enter a value between {0} and {1}."); - equals( "Please enter a value between 1 and 2.", template([1, 2]) ); -}); - -test("option: ignore", function() { - var v = $("#testForm1").validate({ - ignore: "[name=lastname]" - }); - v.form(); - equals( 1, v.size() ); -}); - -test("option: subformRequired", function() { - jQuery.validator.addMethod("billingRequired", function(value, element) { - if ($("#bill_to_co").is(":checked")) - return $(element).parents("#subform").length; - return !this.optional(element); - }, ""); - var v = $("#subformRequired").validate(); - v.form(); - equals( 1, v.size() ); - $("#bill_to_co").attr("checked", false); - v.form(); - equals( 2, v.size() ); - - delete $.validator.methods.billingRequired; - delete $.validator.messages.billingRequired; -}); - -module("expressions"); - -test("expression: :blank", function() { - var e = $("#lastname")[0]; - equals( 1, $(e).filter(":blank").length ); - e.value = " "; - equals( 1, $(e).filter(":blank").length ); - e.value = " " - equals( 1, $(e).filter(":blank").length ); - e.value= " a "; - equals( 0, $(e).filter(":blank").length ); -}); - -test("expression: :filled", function() { - var e = $("#lastname")[0]; - equals( 0, $(e).filter(":filled").length ); - e.value = " "; - equals( 0, $(e).filter(":filled").length ); - e.value = " " - equals( 0, $(e).filter(":filled").length ); - e.value= " a "; - equals( 1, $(e).filter(":filled").length ); -}); - -test("expression: :unchecked", function() { - var e = $("#check2")[0]; - equals( 1, $(e).filter(":unchecked").length ); - e.checked = true; - equals( 0, $(e).filter(":unchecked").length ); - e.checked = false; - equals( 1, $(e).filter(":unchecked").length ); -}); - -module("events"); - -test("validate on blur", function() { - function errors(expected, message) { - equals(v.size(), expected, message ); - } - function labels(expected) { - equals(v.errors().filter(":visible").size(), expected); - } - function blur(target) { - target.trigger("blur").trigger("focusout"); - } - $("#errorFirstname").hide(); - var e = $("#firstname"); - var v = $("#testForm1").validate(); - $("#something").val(""); - blur(e); - errors(0, "No value yet, required is skipped on blur"); - labels(0); - e.val("h"); - blur(e); - errors(1, "Required was ignored, but as something was entered, check other rules, minlength isn't met"); - labels(1); - e.val("hh"); - blur(e); - errors(0, "All is fine"); - labels(0); - e.val(""); - v.form(); - errors(3, "Submit checks all rules, both fields invalid"); - labels(3); - blur(e); - errors(1, "Blurring the field results in emptying the error list first, then checking the invalid field: its still invalid, don't remove the error" ); - labels(3); - e.val("h"); - blur(e); - errors(1, "Entering a single character fulfills required, but not minlength: 2, still invalid"); - labels(3); - e.val("hh"); - blur(e); - errors(0, "Both required and minlength are met, no errors left"); - labels(2); -}); - -test("validate on keyup", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - function keyup(target) { - target.trigger("keyup"); - } - var e = $("#firstname"); - var v = $("#testForm1").validate(); - keyup(e); - errors(0, "No value, no errors"); - e.val("a"); - keyup(e); - errors(0, "Value, but not invalid"); - e.val(""); - v.form(); - errors(2, "Both invalid"); - keyup(e); - errors(1, "Only one field validated, still invalid"); - e.val("hh"); - keyup(e); - errors(0, "Not invalid anymore"); - e.val("h"); - keyup(e); - errors(1, "Field didn't loose focus, so validate again, invalid"); - e.val("hh"); - keyup(e); - errors(0, "Valid"); -}); - -test("validate on not keyup, only blur", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - var e = $("#firstname"); - var v = $("#testForm1").validate({ - onkeyup: false - }); - errors(0); - e.val("a"); - e.trigger("keyup"); - e.keyup(); - errors(0); - e.trigger("blur").trigger("focusout"); - errors(1); -}); - -test("validate on keyup and blur", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - var e = $("#firstname"); - var v = $("#testForm1").validate(); - errors(0); - e.val("a"); - e.trigger("keyup"); - errors(0); - e.trigger("blur").trigger("focusout"); - errors(1); -}); - -test("validate email on keyup and blur", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - var e = $("#firstname"); - var v = $("#testForm1").validate(); - v.form(); - errors(2); - e.val("a"); - e.trigger("keyup"); - errors(1); - e.val("aa"); - e.trigger("keyup"); - errors(0); -}); - -test("validate checkbox on click", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - function trigger(element) { - element.click(); - // triggered click event screws up checked-state in 1.4 - element.valid(); - } - var e = $("#check2"); - var v = $("#form").validate({ - rules: { - check2: "required" - } - }); - trigger(e); - errors(0); - trigger(e); - equals( false, v.form() ); - errors(1); - trigger(e); - errors(0); - trigger(e); - errors(1); -}); - -test("validate multiple checkbox on click", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - function trigger(element) { - element.click(); - // triggered click event screws up checked-state in 1.4 - element.valid(); - } - var e1 = $("#check1").attr("checked", false); - var e2 = $("#check1b"); - var v = $("#form").validate({ - rules: { - check: { - required: true, - minlength: 2 - } - } - }); - trigger(e1); - trigger(e2); - errors(0); - trigger(e2); - equals( false, v.form() ); - errors(1); - trigger(e2); - errors(0); - trigger(e2); - errors(1); -}); - -test("validate radio on click", function() { - function errors(expected, message) { - equals(expected, v.size(), message ); - } - function trigger(element) { - element.click(); - // triggered click event screws up checked-state in 1.4 - element.valid(); - } - var e1 = $("#radio1"); - var e2 = $("#radio1a"); - var v = $("#form").validate({ - rules: { - radio1: "required" - } - }); - errors(0); - equals( false, v.form() ); - errors(1); - trigger(e2); - errors(0); - trigger(e1); - errors(0); -}); - -module("ajax"); - -test("check the serverside script works", function() { - stop(); - $.getJSON("users.php", {value: 'asd'}, function(response) { - ok( response, "yet available" ); - $.getJSON("users.php", {username: "asdf"}, function(response) { - ok( !response, "already taken" ); - start(); - }); - }); -}); - -test("check the serverside script works2", function() { - stop(); - $.getJSON("users2.php", {value: 'asd'}, function(response) { - ok( response, "yet available" ); - $.getJSON("users.php", {username: "asdf"}, function(response) { - ok( !response, "asdf is already taken, please try something else" ); - start(); - }); - }); -}); +jQuery.validator.defaults.debug = true; + +module("validator"); + +test("Constructor", function() { + var v1 = $("#testForm1").validate(); + var v2 = $("#testForm1").validate(); + equals( v1, v2, "Calling validate() multiple times must return the same validator instance" ); + equals( v1.elements().length, 3, "validator elements" ); +}); + +test("validate() without elements, with non-form elements", function() { + $("#doesn'texist").validate(); +}); + +test("valid() plugin method", function() { + var form = $("#userForm"); + form.validate(); + ok ( !form.valid(), "Form isn't valid yet" ); + var input = $("#username"); + ok ( !input.valid(), "Input isn't valid either" ); + input.val("Hello world"); + ok ( form.valid(), "Form is now valid" ); + ok ( input.valid(), "Input is valid, too" ); +}); + +test("valid() plugin method", function() { + var form = $("#testForm1"); + form.validate(); + var inputs = form.find("input"); + ok( !inputs.valid(), "all invalid" ); + inputs.not(":first").val("ok"); + ok( !inputs.valid(), "just one invalid" ); + inputs.val("ok"); + ok( inputs.valid(), "all valid" ); +}); + +test("valid() plugin method, special handling for checkable groups", function() { + // rule is defined on first checkbox, must apply to others, too + var checkable = $("#checkable2"); + ok( !checkable.valid(), "must be invalid, not checked yet" ); + checkable.attr("checked", true); + ok( checkable.valid(), "valid, is now checked" ); + checkable.attr("checked", false); + ok( !checkable.valid(), "invalid again" ); + $("#checkable3").attr("checked", true); + ok( checkable.valid(), "valid, third box is checked" ); +}); + +test("addMethod", function() { + expect( 3 ); + $.validator.addMethod("hi", function(value) { + return value == "hi"; + }, "hi me too"); + var method = $.validator.methods.hi, + e = $('#text1')[0]; + ok( !method(e.value, e), "Invalid" ); + e.value = "hi"; + ok( method(e.value, e), "Invalid" ); + ok( jQuery.validator.messages.hi == "hi me too", "Check custom message" ); +}); + +test("addMethod2", function() { + expect( 4 ); + $.validator.addMethod("complicatedPassword", function(value, element, param) { + return this.optional(element) || /\D/.test(value) && /\d/.test(value) + }, "Your password must contain at least one number and one letter"); + var v = jQuery("#form").validate({ + rules: { + action: { complicatedPassword: true } + } + }); + var rule = $.validator.methods.complicatedPassword, + e = $('#text1')[0]; + e.value = ""; + ok( v.element(e) === undefined, "Rule is optional, valid" ); + equals( 0, v.size() ); + e.value = "ko"; + ok( !v.element(e), "Invalid, doesn't contain one of the required characters" ); + e.value = "ko1"; + ok( v.element(e) ); +}); + +test("form(): simple", function() { + expect( 2 ); + var form = $('#testForm1')[0]; + var v = $(form).validate(); + ok( !v.form(), 'Invalid form' ); + $('#firstname').val("hi"); + $('#lastname').val("hi"); + ok( v.form(), 'Valid form' ); +}); + +test("form(): checkboxes: min/required", function() { + expect( 3 ); + var form = $('#testForm6')[0]; + var v = $(form).validate(); + ok( !v.form(), 'Invalid form' ); + $('#form6check1').attr("checked", true); + ok( !v.form(), 'Invalid form' ); + $('#form6check2').attr("checked", true); + ok( v.form(), 'Valid form' ); +}); +test("form(): selects: min/required", function() { + expect( 3 ); + var form = $('#testForm7')[0]; + var v = $(form).validate(); + ok( !v.form(), 'Invalid form' ); + $("#optionxa").attr("selected", true); + ok( !v.form(), 'Invalid form' ); + $("#optionxb").attr("selected", true); + ok( v.form(), 'Valid form' ); +}); + +test("form(): with equalTo", function() { + expect( 2 ); + var form = $('#testForm5')[0]; + var v = $(form).validate(); + ok( !v.form(), 'Invalid form' ); + $('#x1, #x2').val("hi"); + ok( v.form(), 'Valid form' ); +}); + +test("check(): simple", function() { + expect( 3 ); + var element = $('#firstname')[0]; + var v = $('#testForm1').validate(); + ok( v.size() == 0, 'No errors yet' ); + v.check(element); + ok( v.size() == 1, 'error exists' ); + v.errorList = []; + $('#firstname').val("hi"); + v.check(element); + ok( !v.size() == 1, 'No more errors' ); +}); + +test("hide(): input", function() { + expect( 3 ); + var errorLabel = $('#errorFirstname'); + var element = $('#firstname')[0]; + element.value ="bla"; + var v = $('#testForm1').validate(); + errorLabel.show(); + ok( errorLabel.is(":visible"), "Error label visible before validation" ); + ok( v.element(element) ); + ok( errorLabel.is(":hidden"), "Error label not visible after validation" ); +}); + +test("hide(): radio", function() { + expect( 2 ); + var errorLabel = $('#agreeLabel'); + var element = $('#agb')[0]; + element.checked = true; + var v = $('#testForm2').validate({ errorClass: "xerror" }); + errorLabel.show(); + ok( errorLabel.is(":visible"), "Error label visible after validation" ); + v.element(element); + ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); +}); + +test("hide(): errorWrapper", function() { + expect(2); + var errorLabel = $('#errorWrapper'); + var element = $('#meal')[0]; + element.selectedIndex = 1; + + errorLabel.show(); + ok( errorLabel.is(":visible"), "Error label visible after validation" ); + var v = $('#testForm3').validate({ wrapper: "li", errorLabelContainer: $("#errorContainer") }); + v.element(element); + ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); +}); + +test("hide(): container", function() { + expect(4); + var errorLabel = $('#errorContainer'); + var element = $('#testForm3')[0]; + var v = $('#testForm3').validate({ errorWrapper: "li", errorContainer: $("#errorContainer") }); + v.form(); + ok( errorLabel.is(":visible"), "Error label visible after validation" ); + $('#meal')[0].selectedIndex = 1; + v.form(); + ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); + $('#meal')[0].selectedIndex = -1; + v.element("#meal"); + ok( errorLabel.is(":visible"), "Error label visible after validation" ); + $('#meal')[0].selectedIndex = 1; + v.element("#meal"); + ok( errorLabel.is(":hidden"), "Error label not visible after hiding it" ); +}); + +test("valid()", function() { + expect(4); + var errorList = [{name:"meal",message:"foo", element:$("#meal")[0]}]; + var v = $('#testForm3').validate(); + ok( v.valid(), "No errors, must be valid" ); + v.errorList = errorList; + ok( !v.valid(), "One error, must be invalid" ); + reset(); + v = $('#testForm3').validate({ submitHandler: function() { + ok( false, "Submit handler was called" ); + }}); + ok( v.valid(), "No errors, must be valid and returning true, even with the submit handler" ); + v.errorList = errorList; + ok( !v.valid(), "One error, must be invalid, no call to submit handler" ); +}); + +test("submitHandler keeps submitting button", function() { + $("#userForm").validate({ + debug: true, + submitHandler: function(form) { + // dunno how to test this better; this tests the implementation that uses a hidden input + var hidden = $(form).find("input:hidden")[0]; + same(hidden.value, button.value) + same(hidden.name, button.name) + } + }); + $("#username").val("bla"); + var button = $("#userForm :submit")[0] + $(button).triggerHandler("click"); + $("#userForm").submit(); +}); + +test("showErrors()", function() { + expect( 4 ); + var errorLabel = $('#errorFirstname').hide(); + var element = $('#firstname')[0]; + var v = $('#testForm1').validate(); + ok( errorLabel.is(":hidden") ); + equals( 0, $("label.error[for=lastname]").size() ); + v.showErrors({"firstname": "required", "lastname": "bla"}); + equals( true, errorLabel.is(":visible") ); + equals( true, $("label.error[for=lastname]").is(":visible") ); +}); + +test("showErrors(), allow empty string and null as default message", function() { + $("#userForm").validate({ + rules: { + username: { + required: true, + minlength: 3 + } + }, + messages: { + username: { + required: "", + minlength: "too short" + } + } + }); + ok( !$("#username").valid() ); + equals( "", $("label.error[for=username]").text() ); + + $("#username").val("ab"); + ok( !$("#username").valid() ); + equals( "too short", $("label.error[for=username]").text() ); + + $("#username").val("abc"); + ok( $("#username").valid() ); + ok( $("label.error[for=username]").is(":hidden") ); +}); + +test("showErrors() - external messages", function() { + expect( 4 ); + var methods = $.extend({}, $.validator.methods); + var messages = $.extend({}, $.validator.messages); + $.validator.addMethod("foo", function() { return false; }); + $.validator.addMethod("bar", function() { return false; }); + equals( 0, $("#testForm4 label.error[for=f1]").size() ); + equals( 0, $("#testForm4 label.error[for=f2]").size() ); + var form = $('#testForm4')[0]; + var v = $(form).validate({ + messages: { + f1: "Please!", + f2: "Wohoo!" + } + }); + v.form(); + equals( $("#testForm4 label.error[for=f1]").text(), "Please!" ); + equals( $("#testForm4 label.error[for=f2]").text(), "Wohoo!" ); + + $.validator.methods = methods; + $.validator.messages = messages; +}); + +test("showErrors() - custom handler", function() { + expect(5); + var v = $('#testForm1').validate({ + showErrors: function(errorMap, errorList) { + equals( v, this ); + equals( v.errorList, errorList ); + equals( v.errorMap, errorMap ); + equals( "buga", errorMap.firstname ); + equals( "buga", errorMap.lastname ); + } + }); + v.form(); +}); + +test("option: (un)highlight, default", function() { + $("#testForm1").validate(); + var e = $("#firstname") + ok( !e.hasClass("error") ); + ok( !e.hasClass("valid") ); + e.valid() + ok( e.hasClass("error") ); + ok( !e.hasClass("valid") ); + e.val("hithere").valid() + ok( !e.hasClass("error") ); + ok( e.hasClass("valid") ); +}); + +test("option: (un)highlight, nothing", function() { + expect(3); + $("#testForm1").validate({ + highlight: false, + unhighlight: false + }); + var e = $("#firstname") + ok( !e.hasClass("error") ); + e.valid() + ok( !e.hasClass("error") ); + e.valid() + ok( !e.hasClass("error") ); +}); + +test("option: (un)highlight, custom", function() { + expect(5); + $("#testForm1clean").validate({ + highlight: function(element, errorClass) { + equals( "invalid", errorClass ); + $(element).hide(); + }, + unhighlight: function(element, errorClass) { + equals( "invalid", errorClass ) + $(element).show(); + }, + errorClass: "invalid", + rules: { + firstname: "required" + } + }); + var e = $("#firstnamec") + ok( e.is(":visible") ); + e.valid() + ok( !e.is(":visible") ); + e.val("hithere").valid() + ok( e.is(":visible") ); +}); + +test("option: (un)highlight, custom2", function() { + expect(6); + $("#testForm1").validate({ + highlight: function(element, errorClass) { + $(element).addClass(errorClass); + $(element.form).find("label[for=" + element.id + "]").addClass(errorClass); + }, + unhighlight: function(element, errorClass) { + $(element).removeClass(errorClass); + $(element.form).find("label[for=" + element.id + "]").removeClass(errorClass); + }, + errorClass: "invalid" + }); + var e = $("#firstname") + var l = $("#errorFirstname") + ok( !e.is(".invalid") ); + ok( !l.is(".invalid") ); + e.valid() + ok( e.is(".invalid") ); + ok( l.is(".invalid") ); + e.val("hithere").valid() + ok( !e.is(".invalid") ); + ok( !l.is(".invalid") ); +}); + +test("elements() order", function() { + var container = $("#orderContainer"); + var v = $("#elementsOrder").validate({ + errorLabelContainer: container, + wrap: "li" + }); + isSet( v.elements().get(), q("order1", "order2", "order3", "order4", "order5", "order6"), "elements must be in document order" ); + v.form(); + same( container.children().map(function() { + return $(this).attr("for"); + }).get(), ["order1", "order2", "order3", "order4", "order5", "order6"], "labels in error container must be in document order" ); +}); + +test("defaultMessage(), empty title is ignored", function() { + var v = $("#userForm").validate(); + equals( "This field is required.", v.defaultMessage($("#username")[0], "required") ); +}); + +test("formatAndAdd", function() { + expect(4); + var v = $("#form").validate(); + var fakeElement = { form: $("#form")[0], name: "bar" }; + v.formatAndAdd(fakeElement, {method: "maxlength", parameters: 2}) + equals( "Please enter no more than 2 characters.", v.errorList[0].message ); + equals( "bar", v.errorList[0].element.name ); + + v.formatAndAdd(fakeElement, {method: "range", parameters:[2,4]}) + equals( "Please enter a value between 2 and 4.", v.errorList[1].message ); + + v.formatAndAdd(fakeElement, {method: "range", parameters:[0,4]}) + equals( "Please enter a value between 0 and 4.", v.errorList[2].message ); +}); + +test("formatAndAdd2", function() { + expect(3); + var v = $("#form").validate(); + var fakeElement = { form: $("#form")[0], name: "bar" }; + jQuery.validator.messages.test1 = function(param, element) { + equals( v, this ); + equals( 0, param ); + return "element " + element.name + " is not valid"; + }; + v.formatAndAdd(fakeElement, {method: "test1", parameters: 0}) + equals( "element bar is not valid", v.errorList[0].message ); +}); + +test("formatAndAdd, auto detect substitution string", function() { + var v = $("#testForm1clean").validate({ + rules: { + firstname: { + required: true, + rangelength: [5, 10] + } + }, + messages: { + firstname: { + rangelength: "at least ${0}, up to {1}" + } + } + }); + $("#firstnamec").val("abc"); + v.form(); + equals( "at least 5, up to 10", v.errorList[0].message ); +}) + +test("error containers, simple", function() { + expect(14); + var container = $("#simplecontainer"); + var v = $("#form").validate({ + errorLabelContainer: container, + showErrors: function() { + container.find("h3").html( jQuery.validator.format("There are {0} errors in your form.", this.size()) ); + this.defaultShowErrors(); + } + }); + + v.prepareForm(); + ok( v.valid(), "form is valid" ); + equals( 0, container.find("label").length, "There should be no error labels" ); + equals( "", container.find("h3").html() ); + + v.prepareForm(); + v.errorList = [{message:"bar", element: {name:"foo"}}, {message: "necessary", element: {name:"required"}}]; + ok( !v.valid(), "form is not valid after adding errors manually" ); + v.showErrors(); + equals( container.find("label").length, 2, "There should be two error labels" ); + ok( container.is(":visible"), "Check that the container is visible" ); + container.find("label").each(function() { + ok( $(this).is(":visible"), "Check that each label is visible" ); + }); + equals( "There are 2 errors in your form.", container.find("h3").html() ); + + v.prepareForm(); + ok( v.valid(), "form is valid after a reset" ); + v.showErrors(); + equals( container.find("label").length, 2, "There should still be two error labels" ); + ok( container.is(":hidden"), "Check that the container is hidden" ); + container.find("label").each(function() { + ok( $(this).is(":hidden"), "Check that each label is hidden" ); + }); +}); + +test("error containers, with labelcontainer I", function() { + expect(16); + var container = $("#container"), + labelcontainer = $("#labelcontainer"); + var v = $("#form").validate({ + errorContainer: container, + errorLabelContainer: labelcontainer, + wrapper: "li" + }); + + ok( v.valid(), "form is valid" ); + equals( 0, container.find("label").length, "There should be no error labels in the container" ); + equals( 0, labelcontainer.find("label").length, "There should be no error labels in the labelcontainer" ); + equals( 0, labelcontainer.find("li").length, "There should be no lis labels in the labelcontainer" ); + + v.errorList = [{message:"bar", element: {name:"foo"}}, {name: "required", message: "necessary", element: {name:"required"}}]; + ok( !v.valid(), "form is not valid after adding errors manually" ); + v.showErrors(); + equals( 0, container.find("label").length, "There should be no error label in the container" ); + equals( 2, labelcontainer.find("label").length, "There should be two error labels in the labelcontainer" ); + equals( 2, labelcontainer.find("li").length, "There should be two error lis in the labelcontainer" ); + ok( container.is(":visible"), "Check that the container is visible" ); + ok( labelcontainer.is(":visible"), "Check that the labelcontainer is visible" ); + var labels = labelcontainer.find("label").each(function() { + ok( $(this).is(":visible"), "Check that each label is visible1" ); + equals( "li", $(this).parent()[0].tagName.toLowerCase(), "Check that each label is wrapped in an li" ); + ok( $(this).parent("li").is(":visible"), "Check that each parent li is visible" ); + }); +}); + +test("errorcontainer, show/hide only on submit", function() { + expect(14); + var container = $("#container"); + var labelContainer = $("#labelcontainer"); + var v = $("#testForm1").bind("invalid-form.validate", function() { + ok( true, "invalid-form event triggered called" ); + }).validate({ + errorContainer: container, + errorLabelContainer: labelContainer, + showErrors: function() { + container.html( jQuery.validator.format("There are {0} errors in your form.", this.numberOfInvalids()) ); + ok( true, "showErrors called" ); + this.defaultShowErrors(); + } + }); + equals( "", container.html(), "must be empty" ); + equals( "", labelContainer.html(), "must be empty" ); + // validate whole form, both showErrors and invalidHandler must be called once + // preferably invalidHandler first, showErrors second + ok( !v.form(), "invalid form" ); + equals( 2, labelContainer.find("label").length ); + equals( "There are 2 errors in your form.", container.html() ); + ok( labelContainer.is(":visible"), "must be visible" ); + ok( container.is(":visible"), "must be visible" ); + + $("#firstname").val("hix").keyup(); + $("#testForm1").triggerHandler("keyup", [jQuery.event.fix({ type: "keyup", target: $("#firstname")[0] })]); + equals( 1, labelContainer.find("label:visible").length ); + equals( "There are 1 errors in your form.", container.html() ); + + $("#lastname").val("abc"); + ok( v.form(), "Form now valid, trigger showErrors but not invalid-form" ); +}); + +test("option invalidHandler", function() { + expect(1); + var v = $("#testForm1clean").validate({ + invalidHandler: function() { + ok( true, "invalid-form event triggered called" ); + start(); + } + }); + $("#usernamec").val("asdf").rules("add", { required: true, remote: "users.php" }); + stop(); + $("#testForm1clean").submit(); +}); + +test("findByName()", function() { + isSet( new $.validator({}, document.getElementById("form")).findByName(document.getElementById("radio1").name), $("#form").find("[name=radio1]") ); +}); + +test("focusInvalid()", function() { + expect(1); + var inputs = $("#testForm1 input").focus(function() { + equals( inputs[0], this, "focused first element" ); + }); + var v = $("#testForm1").validate(); + v.form(); + // have to explicitly show input elements with error class, they are hidden by testsuite styles + inputs.show(); + v.focusInvalid(); +}); + +test("findLastActive()", function() { + expect(3); + var v = $("#testForm1").validate(); + ok( !v.findLastActive() ); + v.form(); + v.focusInvalid(); + equals( v.findLastActive(), $("#firstname")[0] ); + var lastActive = $("#lastname").trigger("focus").trigger("focusin")[0]; + equals( v.lastActive, lastActive ); +}); + +test("validating multiple checkboxes with 'required'", function() { + expect(3); + var checkboxes = $("#form input[name=check3]").attr("checked", false); + equals(5, checkboxes.size()); + var v = $("#form").validate({ + rules: { + check3: "required" + } + }); + v.form(); + equals(1, v.size()); + checkboxes.filter(":last").attr("checked", true); + v.form(); + equals(0, v.size()); +}); + +test("dynamic form", function() { + var counter = 0; + function add() { + $("").appendTo("#testForm2"); + } + function errors(expected, message) { + equals(expected, v.size(), message ); + } + var v = $("#testForm2").validate(); + v.form(); + errors(1); + add(); + v.form(); + errors(2); + add(); + v.form(); + errors(3); + $("#testForm2 input[name=list1]").remove(); + v.form(); + errors(2); + add(); + v.form(); + errors(3); + $("#testForm2 input[name^=list]").remove(); + v.form(); + errors(1); + $("#agb").attr("disabled", true); + v.form(); + errors(0); + $("#agb").attr("disabled", false); + v.form(); + errors(1); +}); + +test("idOrName()", function() { + expect(4); + var v = $("#testForm1").validate(); + equals( "form8input", v.idOrName( $("#form8input")[0] ) ); + equals( "check", v.idOrName( $("#form6check1")[0] ) ); + equals( "agree", v.idOrName( $("#agb")[0] ) ); + equals( "button", v.idOrName( $("#form :button")[0] ) ); +}); + +test("resetForm()", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + var v = $("#testForm1").validate(); + v.form(); + errors(2); + $("#firstname").val("hiy"); + v.resetForm(); + errors(0); + equals("", $("#firstname").val(), "form plugin is included, therefor resetForm must also reset inputs, not only errors"); +}); + +test("message from title", function() { + var v = $("#withTitle").validate(); + v.checkForm(); + equals(v.errorList[0].message, "fromtitle", "title not used"); +}); + +test("ignoreTitle", function() { + var v = $("#withTitle").validate({ignoreTitle:true}); + v.checkForm(); + equals(v.errorList[0].message, $.validator.messages["required"], "title used when it should have been ignored"); +}); + +test("ajaxSubmit", function() { + expect(1); + stop(); + $("#user").val("Peter"); + $("#password").val("foobar"); + jQuery("#signupForm").validate({ + submitHandler: function(form) { + jQuery(form).ajaxSubmit({ + success: function(response) { + equals("Hi Peter, welcome back.", response); + start(); + } + }); + } + }); + jQuery("#signupForm").triggerHandler("submit"); +}); + + +module("misc"); + +test("success option", function() { + expect(7); + equals( "", $("#firstname").val() ); + var v = $("#testForm1").validate({ + success: "valid" + }); + var label = $("#testForm1 label"); + ok( label.is(".error") ); + ok( !label.is(".valid") ); + v.form(); + ok( label.is(".error") ); + ok( !label.is(".valid") ); + $("#firstname").val("hi"); + v.form(); + ok( label.is(".error") ); + ok( label.is(".valid") ); +}); + +test("success option2", function() { + expect(5); + equals( "", $("#firstname").val() ); + var v = $("#testForm1").validate({ + success: "valid" + }); + var label = $("#testForm1 label"); + ok( label.is(".error") ); + ok( !label.is(".valid") ); + $("#firstname").val("hi"); + v.form(); + ok( label.is(".error") ); + ok( label.is(".valid") ); +}); + +test("success option3", function() { + expect(5); + equals( "", $("#firstname").val() ); + $("#errorFirstname").remove(); + var v = $("#testForm1").validate({ + success: "valid" + }); + equals( 0, $("#testForm1 label").size() ); + $("#firstname").val("hi"); + v.form(); + var labels = $("#testForm1 label"); + equals( 3, labels.size() ); + ok( labels.eq(0).is(".valid") ); + ok( !labels.eq(1).is(".valid") ); +}); + +test("successlist", function() { + var v = $("#form").validate({ success: "xyz" }); + v.form(); + equals(0, v.successList.length); +}); + +test("success isn't called for optional elements", function() { + expect(4); + equals( "", $("#firstname").removeClass().val() ); + $("#something").remove(); + $("#lastname").remove(); + $("#errorFirstname").remove(); + var v = $("#testForm1").validate({ + success: function() { + ok( false, "don't call success for optional elements!" ); + }, + rules: { + firstname: "email" + } + }); + equals( 0, $("#testForm1 label").size() ); + v.form(); + equals( 0, $("#testForm1 label").size() ); + $("#firstname").valid(); + equals( 0, $("#testForm1 label").size() ); +}); + +test("all rules are evaluated even if one returns a dependency-mistmatch", function() { + expect(6); + equals( "", $("#firstname").removeClass().val() ); + $("#lastname").remove(); + $("#errorFirstname").remove(); + $.validator.addMethod("custom1", function() { + ok( true, "custom method must be evaluated" ); + return true; + }, ""); + var v = $("#testForm1").validate({ + rules: { + firstname: {email:true, custom1: true} + } + }); + equals( 0, $("#testForm1 label").size() ); + v.form(); + equals( 0, $("#testForm1 label").size() ); + $("#firstname").valid(); + equals( 0, $("#testForm1 label").size() ); + + delete $.validator.methods.custom1; + delete $.validator.messages.custom1; +}); + +test("messages", function() { + var m = jQuery.validator.messages; + equals( "Please enter no more than 0 characters.", m.maxlength(0) ); + equals( "Please enter at least 1 characters.", m.minlength(1) ); + equals( "Please enter a value between 1 and 2 characters long.", m.rangelength([1, 2]) ); + equals( "Please enter a value less than or equal to 1.", m.max(1) ); + equals( "Please enter a value greater than or equal to 0.", m.min(0) ); + equals( "Please enter a value between 1 and 2.", m.range([1, 2]) ); +}); + +test("jQuery.validator.format", function() { + equals( "Please enter a value between 0 and 1.", jQuery.validator.format("Please enter a value between {0} and {1}.", 0, 1) ); + equals( "0 is too fast! Enter a value smaller then 0 and at least -15", jQuery.validator.format("{0} is too fast! Enter a value smaller then {0} and at least {1}", 0, -15) ); + var template = jQuery.validator.format("{0} is too fast! Enter a value smaller then {0} and at least {1}"); + equals( "0 is too fast! Enter a value smaller then 0 and at least -15", template(0, -15) ); + template = jQuery.validator.format("Please enter a value between {0} and {1}."); + equals( "Please enter a value between 1 and 2.", template([1, 2]) ); +}); + +test("option: ignore", function() { + var v = $("#testForm1").validate({ + ignore: "[name=lastname]" + }); + v.form(); + equals( 1, v.size() ); +}); + +test("option: subformRequired", function() { + jQuery.validator.addMethod("billingRequired", function(value, element) { + if ($("#bill_to_co").is(":checked")) + return $(element).parents("#subform").length; + return !this.optional(element); + }, ""); + var v = $("#subformRequired").validate(); + v.form(); + equals( 1, v.size() ); + $("#bill_to_co").attr("checked", false); + v.form(); + equals( 2, v.size() ); + + delete $.validator.methods.billingRequired; + delete $.validator.messages.billingRequired; +}); + +module("expressions"); + +test("expression: :blank", function() { + var e = $("#lastname")[0]; + equals( 1, $(e).filter(":blank").length ); + e.value = " "; + equals( 1, $(e).filter(":blank").length ); + e.value = " " + equals( 1, $(e).filter(":blank").length ); + e.value= " a "; + equals( 0, $(e).filter(":blank").length ); +}); + +test("expression: :filled", function() { + var e = $("#lastname")[0]; + equals( 0, $(e).filter(":filled").length ); + e.value = " "; + equals( 0, $(e).filter(":filled").length ); + e.value = " " + equals( 0, $(e).filter(":filled").length ); + e.value= " a "; + equals( 1, $(e).filter(":filled").length ); +}); + +test("expression: :unchecked", function() { + var e = $("#check2")[0]; + equals( 1, $(e).filter(":unchecked").length ); + e.checked = true; + equals( 0, $(e).filter(":unchecked").length ); + e.checked = false; + equals( 1, $(e).filter(":unchecked").length ); +}); + +module("events"); + +test("validate on blur", function() { + function errors(expected, message) { + equals(v.size(), expected, message ); + } + function labels(expected) { + equals(v.errors().filter(":visible").size(), expected); + } + function blur(target) { + target.trigger("blur").trigger("focusout"); + } + $("#errorFirstname").hide(); + var e = $("#firstname"); + var v = $("#testForm1").validate(); + $("#something").val(""); + blur(e); + errors(0, "No value yet, required is skipped on blur"); + labels(0); + e.val("h"); + blur(e); + errors(1, "Required was ignored, but as something was entered, check other rules, minlength isn't met"); + labels(1); + e.val("hh"); + blur(e); + errors(0, "All is fine"); + labels(0); + e.val(""); + v.form(); + errors(3, "Submit checks all rules, both fields invalid"); + labels(3); + blur(e); + errors(1, "Blurring the field results in emptying the error list first, then checking the invalid field: its still invalid, don't remove the error" ); + labels(3); + e.val("h"); + blur(e); + errors(1, "Entering a single character fulfills required, but not minlength: 2, still invalid"); + labels(3); + e.val("hh"); + blur(e); + errors(0, "Both required and minlength are met, no errors left"); + labels(2); +}); + +test("validate on keyup", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + function keyup(target) { + target.trigger("keyup"); + } + var e = $("#firstname"); + var v = $("#testForm1").validate(); + keyup(e); + errors(0, "No value, no errors"); + e.val("a"); + keyup(e); + errors(0, "Value, but not invalid"); + e.val(""); + v.form(); + errors(2, "Both invalid"); + keyup(e); + errors(1, "Only one field validated, still invalid"); + e.val("hh"); + keyup(e); + errors(0, "Not invalid anymore"); + e.val("h"); + keyup(e); + errors(1, "Field didn't loose focus, so validate again, invalid"); + e.val("hh"); + keyup(e); + errors(0, "Valid"); +}); + +test("validate on not keyup, only blur", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + var e = $("#firstname"); + var v = $("#testForm1").validate({ + onkeyup: false + }); + errors(0); + e.val("a"); + e.trigger("keyup"); + e.keyup(); + errors(0); + e.trigger("blur").trigger("focusout"); + errors(1); +}); + +test("validate on keyup and blur", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + var e = $("#firstname"); + var v = $("#testForm1").validate(); + errors(0); + e.val("a"); + e.trigger("keyup"); + errors(0); + e.trigger("blur").trigger("focusout"); + errors(1); +}); + +test("validate email on keyup and blur", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + var e = $("#firstname"); + var v = $("#testForm1").validate(); + v.form(); + errors(2); + e.val("a"); + e.trigger("keyup"); + errors(1); + e.val("aa"); + e.trigger("keyup"); + errors(0); +}); + +test("validate checkbox on click", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + function trigger(element) { + element.click(); + // triggered click event screws up checked-state in 1.4 + element.valid(); + } + var e = $("#check2"); + var v = $("#form").validate({ + rules: { + check2: "required" + } + }); + trigger(e); + errors(0); + trigger(e); + equals( false, v.form() ); + errors(1); + trigger(e); + errors(0); + trigger(e); + errors(1); +}); + +test("validate multiple checkbox on click", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + function trigger(element) { + element.click(); + // triggered click event screws up checked-state in 1.4 + element.valid(); + } + var e1 = $("#check1").attr("checked", false); + var e2 = $("#check1b"); + var v = $("#form").validate({ + rules: { + check: { + required: true, + minlength: 2 + } + } + }); + trigger(e1); + trigger(e2); + errors(0); + trigger(e2); + equals( false, v.form() ); + errors(1); + trigger(e2); + errors(0); + trigger(e2); + errors(1); +}); + +test("validate radio on click", function() { + function errors(expected, message) { + equals(expected, v.size(), message ); + } + function trigger(element) { + element.click(); + // triggered click event screws up checked-state in 1.4 + element.valid(); + } + var e1 = $("#radio1"); + var e2 = $("#radio1a"); + var v = $("#form").validate({ + rules: { + radio1: "required" + } + }); + errors(0); + equals( false, v.form() ); + errors(1); + trigger(e2); + errors(0); + trigger(e1); + errors(0); +}); + +module("ajax"); + +test("check the serverside script works", function() { + stop(); + $.getJSON("users.php", {value: 'asd'}, function(response) { + ok( response, "yet available" ); + $.getJSON("users.php", {username: "asdf"}, function(response) { + ok( !response, "already taken" ); + start(); + }); + }); +}); + +test("check the serverside script works2", function() { + stop(); + $.getJSON("users2.php", {value: 'asd'}, function(response) { + ok( response, "yet available" ); + $.getJSON("users.php", {username: "asdf"}, function(response) { + ok( !response, "asdf is already taken, please try something else" ); + start(); + }); + }); +}); diff --git a/test/users.php b/test/users.php index d08d0bf9a..08b8fd5f3 100644 --- a/test/users.php +++ b/test/users.php @@ -1,11 +1,11 @@ - \ No newline at end of file diff --git a/test/users2.php b/test/users2.php index 255f2ac1c..3a185cd12 100644 --- a/test/users2.php +++ b/test/users2.php @@ -1,11 +1,11 @@ - \ No newline at end of file diff --git a/todo b/todo index 7477e9637..702a4965f 100644 --- a/todo +++ b/todo @@ -1,172 +1,172 @@ -1.3 ---- - -- checkout datejs.com for a proper date implementation -> complete but very heavy parser, currently overkill - -- rewrite required-method to use jQuery's extended val() on selects[/radios/checkboxes] -- consider a field-validator object that encapsulates a single element and all methods working on it -- export API browser -- add example/support for other URL schemes like svn://.... -- document min/max/range methods for checkboxes/selects - -/** - * Return false, if the element is - * - * - some kind of text input and its value is too short - * - * - a set of checkboxes has not enough boxes checked - * - * - a select and has not enough options selected - * - * Works with all kind of text inputs, checkboxes and select. - * - * @example - * @desc Declares an optional input element with at least 5 characters (or none at all). - * - * @example - * @desc Declares an input element that must have at least 5 characters. - * - * @example
                        - * Spam - * - * - * - * - *
                        - * @desc Specifies a group of checkboxes. To validate, at least two checkboxes must be selected. - * - * @param Number min - * @name jQuery.validator.methods.minLength - * @type Boolean - * @cat Plugins/Validate/Methods - */ - - /** - * Return false, if the element is - * - * - some kind of text input and its value is too short or too long - * - * - a set of checkboxes has not enough or too many boxes checked - * - * - a select and has not enough or too many options selected - * - * Works with all kind of text inputs, checkboxes and selects. - * - * @example - * @desc Declares an optional input element with at least 3 and at most 5 characters (or none at all). - * - * @example - * @desc Declares an input element that must have at least 3 and at most 5 characters. - * - * @example - * @desc Specifies a select that must have at least two but no more than three options selected. - * - * @param Array min/max - * @name jQuery.validator.methods.rangeLength - * @type Boolean - * @cat Plugins/Validate/Methods - */ - -- document numberOfInvalids and hideErrors - -/** - * Returns the number of invalid elements in the form. - * - * @example $("#myform").validate({ - * showErrors: function() { - * $("#summary").html("Your form contains " + this.numberOfInvalids() + " errors, see details below."); - * this.defaultShowErrors(); - * } - * }); - * @desc Specifies a custom showErrors callback that updates the number of invalid elements each - * time the form or a single element is validated. - * - * @name jQuery.validator.prototype.numberOfInvalids - * @type Number - */ - - /** - * Hides all error messages in this form. - * - * @example var validator = $("#myform").validate(); - * $(".cancel").click(function() { - * validator.hideErrors(); - * }); - * @desc Specifies a custom showErrors callback that updates the number of invalid elements each - * time the form or a single element is validated. - * - * @name jQuery.validator.prototype.hideErrors - */ - -- remove deprecated methods - -- css references - - http://test5.caribmedia.com/CSS/Secrets/members/michiel/floating-forms.html - - http://paularmstrongdesigns.com/projects/awesomeform/ - - http://dnevnikeklektika.com/uni-form/ - -- consider validation on page load, disabling required-checks -- completely rework showErrors: manually settings errors is currently extremely flawed and utterly useless, eg. errors disappear if some other validation is triggered -- add custom event to remote validation for adding more parameters - -- document focusInvalid() -- document validation lifecycle: setup (add event handlers), run validation (prepare form, validate elements, display errors/submit form) - -> show where the user can hook in via callbacks - -- AND depedency: specify multiple expressions as an array - -- add custom events for form and elements instead of more callbacks (additional options/callbacks) - - beforeValidation: Callback, called before doing any validation - - beforeSubmit: Callback, called before submitting the form (default submit or calling submitHandler, if specified) - -- animations!! -- ajax validation: - - in combination with autocomplete (mustmatch company name, fill out address details, validate required) - - validate zip code in comparison to address, if match and state is missing, fill out state -- strong password check/integration: http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/ - -- stop firefox password manager to popup before validation - check mozilla bug tracker? - -- overload addMethod with a Option-variant: -$.validator.addMethod({ - name: "custom", - message: "blablabla", - parameteres: false, - handler: function() { ... } -}); - - Examples: - - wordpress comment form, make it a drop-in method - - ajaxForm() integration - - ajaxSubmit with rules-option, more/less options to ajaxSubmit - - watermark integration http://digitalbush.com/projects/watermark-input-plugin - - datepicker integration - - timepicker integration ( http://labs.perifer.se/timedatepicker/ ) - - integration with CakePHP ( https://trac.cakephp.org/ticket/2359 ) - - integration with tabs: http://www.netix.sk/forms/test.html - - intergration with rich-text-editors (FCKEditor, Codepress) - http://www.fyneworks.com/jquery/FCKEditor/ - -2.0 ---- -- attachValidation, removeValidation, validate (with UI), valid (without UI) -- (re)move current addMethod implementation -- move rules plugin option -- move metadata support -- make validate method chainable - -> provide an accessor for the validator if necessary at all +1.3 +--- + +- checkout datejs.com for a proper date implementation -> complete but very heavy parser, currently overkill + +- rewrite required-method to use jQuery's extended val() on selects[/radios/checkboxes] +- consider a field-validator object that encapsulates a single element and all methods working on it +- export API browser +- add example/support for other URL schemes like svn://.... +- document min/max/range methods for checkboxes/selects + +/** + * Return false, if the element is + * + * - some kind of text input and its value is too short + * + * - a set of checkboxes has not enough boxes checked + * + * - a select and has not enough options selected + * + * Works with all kind of text inputs, checkboxes and select. + * + * @example + * @desc Declares an optional input element with at least 5 characters (or none at all). + * + * @example + * @desc Declares an input element that must have at least 5 characters. + * + * @example
                        + * Spam + * + * + * + * + *
                        + * @desc Specifies a group of checkboxes. To validate, at least two checkboxes must be selected. + * + * @param Number min + * @name jQuery.validator.methods.minLength + * @type Boolean + * @cat Plugins/Validate/Methods + */ + + /** + * Return false, if the element is + * + * - some kind of text input and its value is too short or too long + * + * - a set of checkboxes has not enough or too many boxes checked + * + * - a select and has not enough or too many options selected + * + * Works with all kind of text inputs, checkboxes and selects. + * + * @example + * @desc Declares an optional input element with at least 3 and at most 5 characters (or none at all). + * + * @example + * @desc Declares an input element that must have at least 3 and at most 5 characters. + * + * @example + * @desc Specifies a select that must have at least two but no more than three options selected. + * + * @param Array min/max + * @name jQuery.validator.methods.rangeLength + * @type Boolean + * @cat Plugins/Validate/Methods + */ + +- document numberOfInvalids and hideErrors + +/** + * Returns the number of invalid elements in the form. + * + * @example $("#myform").validate({ + * showErrors: function() { + * $("#summary").html("Your form contains " + this.numberOfInvalids() + " errors, see details below."); + * this.defaultShowErrors(); + * } + * }); + * @desc Specifies a custom showErrors callback that updates the number of invalid elements each + * time the form or a single element is validated. + * + * @name jQuery.validator.prototype.numberOfInvalids + * @type Number + */ + + /** + * Hides all error messages in this form. + * + * @example var validator = $("#myform").validate(); + * $(".cancel").click(function() { + * validator.hideErrors(); + * }); + * @desc Specifies a custom showErrors callback that updates the number of invalid elements each + * time the form or a single element is validated. + * + * @name jQuery.validator.prototype.hideErrors + */ + +- remove deprecated methods + +- css references + - http://test5.caribmedia.com/CSS/Secrets/members/michiel/floating-forms.html + - http://paularmstrongdesigns.com/projects/awesomeform/ + - http://dnevnikeklektika.com/uni-form/ + +- consider validation on page load, disabling required-checks +- completely rework showErrors: manually settings errors is currently extremely flawed and utterly useless, eg. errors disappear if some other validation is triggered +- add custom event to remote validation for adding more parameters + +- document focusInvalid() +- document validation lifecycle: setup (add event handlers), run validation (prepare form, validate elements, display errors/submit form) + -> show where the user can hook in via callbacks + +- AND depedency: specify multiple expressions as an array + +- add custom events for form and elements instead of more callbacks (additional options/callbacks) + - beforeValidation: Callback, called before doing any validation + - beforeSubmit: Callback, called before submitting the form (default submit or calling submitHandler, if specified) + +- animations!! +- ajax validation: + - in combination with autocomplete (mustmatch company name, fill out address details, validate required) + - validate zip code in comparison to address, if match and state is missing, fill out state +- strong password check/integration: http://phiras.wordpress.com/2007/04/08/password-strength-meter-a-jquery-plugin/ + +- stop firefox password manager to popup before validation - check mozilla bug tracker? + +- overload addMethod with a Option-variant: +$.validator.addMethod({ + name: "custom", + message: "blablabla", + parameteres: false, + handler: function() { ... } +}); + + Examples: + - wordpress comment form, make it a drop-in method + - ajaxForm() integration + - ajaxSubmit with rules-option, more/less options to ajaxSubmit + - watermark integration http://digitalbush.com/projects/watermark-input-plugin + - datepicker integration + - timepicker integration ( http://labs.perifer.se/timedatepicker/ ) + - integration with CakePHP ( https://trac.cakephp.org/ticket/2359 ) + - integration with tabs: http://www.netix.sk/forms/test.html + - intergration with rich-text-editors (FCKEditor, Codepress) + http://www.fyneworks.com/jquery/FCKEditor/ + +2.0 +--- +- attachValidation, removeValidation, validate (with UI), valid (without UI) +- (re)move current addMethod implementation +- move rules plugin option +- move metadata support +- make validate method chainable + -> provide an accessor for the validator if necessary at all - move a few default methods to additionals, eg. dateXXX, creditcard, definitely accept \ No newline at end of file