You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2006/11/13 23:55:14 UTC
svn commit: r474551 [29/49] - in
/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo:
./ src/ src/alg/ src/animation/ src/cal/ src/charting/ src/charting/svg/
src/charting/vml/ src/collections/ src/crypto/ src/data/ src/data/cs...
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/uuid/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js?view=diff&rev=474551&r1=474550&r2=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate.js Mon Nov 13 14:54:45 2006
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2004-2005, The Dojo Foundation
+ Copyright (c) 2004-2006, The Dojo Foundation
All Rights Reserved.
Licensed under the Academic Free License version 2.1 or above OR the
@@ -9,773 +9,4 @@
*/
dojo.provide("dojo.validate");
-dojo.provide("dojo.validate.us");
-dojo.require("dojo.regexp");
-
-// *** Validation Functions ****
-
-/**
- Checks if a string has non whitespace characters.
- Parameters allow you to constrain the length.
-
- @param value A string.
- @param flags An object.
- flags.length If set, checks if there are exactly flags.length number of characters.
- flags.minlength If set, checks if there are at least flags.minlength number of characters.
- flags.maxlength If set, checks if there are at most flags.maxlength number of characters.
- @return true or false.
-*/
-dojo.validate.isText = function(value, flags) {
- flags = (typeof flags == "object") ? flags : {};
-
- // test for text
- if ( /^\s*$/.test(value) ) { return false; }
-
- // length tests
- if ( typeof flags.length == "number" && flags.length != value.length ) { return false; }
- if ( typeof flags.minlength == "number" && flags.minlength > value.length ) { return false; }
- if ( typeof flags.maxlength == "number" && flags.maxlength < value.length ) { return false; }
-
- return true;
-}
-
-/**
- Validates an IP address.
- Supports 5 formats for IPv4: dotted decimal, dotted hex, dotted octal, decimal and hexadecimal.
- Supports 2 formats for Ipv6.
-
- @param value A string.
- @param flags An object. All flags are boolean with default = true.
- flags.allowDottedDecimal Example, 207.142.131.235. No zero padding.
- flags.allowDottedHex Example, 0x18.0x11.0x9b.0x28. Case insensitive. Zero padding allowed.
- flags.allowDottedOctal Example, 0030.0021.0233.0050. Zero padding allowed.
- flags.allowDecimal Example, 3482223595. A decimal number between 0-4294967295.
- flags.allowHex Example, 0xCF8E83EB. Hexadecimal number between 0x0-0xFFFFFFFF.
- Case insensitive. Zero padding allowed.
- flags.allowIPv6 IPv6 address written as eight groups of four hexadecimal digits.
- flags.allowHybrid IPv6 address written as six groups of four hexadecimal digits
- followed by the usual 4 dotted decimal digit notation of IPv4. x:x:x:x:x:x:d.d.d.d
- @return true or false
-*/
-dojo.validate.isIpAddress = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.ipAddress(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Checks if a string could be a valid URL.
-
- @param value A string.
- @param flags An object.
- flags.scheme Can be true, false, or [true, false].
- This means: required, not allowed, or either.
- flags in regexp.host can be applied.
- flags in regexp.ipAddress can be applied.
- flags in regexp.tld can be applied.
- @return true or false
-*/
-dojo.validate.isUrl = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.url(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Checks if a string could be a valid email address.
-
- @param value A string.
- @param flags An object.
- flags.allowCruft Allow address like <ma...@yahoo.com>. Default is false.
- flags in regexp.host can be applied.
- flags in regexp.ipAddress can be applied.
- flags in regexp.tld can be applied.
- @return true or false.
-*/
-dojo.validate.isEmailAddress = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.emailAddress(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Checks if a string could be a valid email address list.
-
- @param value A string.
- @param flags An object.
- flags.listSeparator The character used to separate email addresses. Default is ";", ",", "\n" or " ".
- flags in regexp.emailAddress can be applied.
- flags in regexp.host can be applied.
- flags in regexp.ipAddress can be applied.
- flags in regexp.tld can be applied.
- @return true or false.
-*/
-dojo.validate.isEmailAddressList = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.emailAddressList(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Check if value is an email address list. If an empty list
- is returned, the value didn't pass the test or it was empty.
-
- @param value A string
- @param flags An object (same as isEmailAddressList)
- @return array of emails
-*/
-dojo.validate.getEmailAddressList = function(value, flags) {
- if(!flags) { flags = {}; }
- if(!flags.listSeparator) { flags.listSeparator = "\\s;,"; }
-
- if ( dojo.validate.isEmailAddressList(value, flags) ) {
- return value.split(new RegExp("\\s*[" + flags.listSeparator + "]\\s*"));
- }
- return [];
-}
-
-/**
- Validates whether a string is in an integer format.
-
- @param value A string.
- @param flags An object.
- flags.signed The leading plus-or-minus sign. Can be true, false, or [true, false].
- Default is [true, false], (i.e. sign is optional).
- flags.separator The character used as the thousands separator. Default is no separator.
- For more than one symbol use an array, e.g. [",", ""], makes ',' optional.
- @return true or false.
-*/
-dojo.validate.isInteger = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.integer(flags) + "$");
- return re.test(value);
-}
-
-/**
- Validates whether a string is a real valued number.
- Format is the usual exponential notation.
-
- @param value A string.
- @param flags An object.
- flags.places The integer number of decimal places.
- If not given, the decimal part is optional and the number of places is unlimited.
- flags.decimal The character used for the decimal point. Default is ".".
- flags.exponent Express in exponential notation. Can be true, false, or [true, false].
- Default is [true, false], (i.e. the exponential part is optional).
- flags.eSigned The leading plus-or-minus sign on the exponent. Can be true, false,
- or [true, false]. Default is [true, false], (i.e. sign is optional).
- flags in regexp.integer can be applied.
- @return true or false.
-*/
-dojo.validate.isRealNumber = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.realNumber(flags) + "$");
- return re.test(value);
-}
-
-/**
- Validates whether a string denotes a monetary value.
-
- @param value A string.
- @param flags An object.
- flags.signed The leading plus-or-minus sign. Can be true, false, or [true, false].
- Default is [true, false], (i.e. sign is optional).
- flags.symbol A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".
- Default is "$". For more than one symbol use an array, e.g. ["$", ""], makes $ optional.
- flags.placement The symbol can come "before" the number or "after". Default is "before".
- flags.separator The character used as the thousands separator. The default is ",".
- flags.cents The two decimal places for cents. Can be true, false, or [true, false].
- Default is [true, false], (i.e. cents are optional).
- flags.decimal The character used for the decimal point. Default is ".".
- @return true or false.
-*/
-dojo.validate.isCurrency = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.currency(flags) + "$");
- return re.test(value);
-}
-
-/**
- Validates U.S. currency.
-
- @param value A string.
- @param flags An object.
- flags in validate.isCurrency can be applied.
- @return true or false.
-*/
-dojo.validate.us.isCurrency = function(value, flags) {
- return dojo.validate.isCurrency(value, flags);
-}
-
-/**
- Validates German currency.
-
- @param value A string.
- @return true or false.
-*/
-dojo.validate.isGermanCurrency = function(value) {
- flags = {
- symbol: "�",
- placement: "after",
- decimal: ",",
- separator: "."
- };
- return dojo.validate.isCurrency(value, flags);
-}
-
-/**
- Validates Japanese currency.
-
- @param value A string.
- @return true or false.
-*/
-dojo.validate.isJapaneseCurrency = function(value) {
- flags = {
- symbol: "�",
- cents: false
- };
- return dojo.validate.isCurrency(value, flags);
-}
-
-/**
- Validates whether a string denoting an integer,
- real number, or monetary value is between a max and min.
-
- @param value A string.
- @param flags An object.
- flags.max A number, which the value must be less than or equal to for the validation to be true.
- flags.min A number, which the value must be greater than or equal to for the validation to be true.
- flags.decimal The character used for the decimal point. Default is ".".
- @return true or false.
-*/
-dojo.validate.isInRange = function(value, flags) {
- // assign default values to missing paramters
- flags = (typeof flags == "object") ? flags : {};
- var max = (typeof flags.max == "number") ? flags.max : Infinity;
- var min = (typeof flags.min == "number") ? flags.min : -Infinity;
- var dec = (typeof flags.decimal == "string") ? flags.decimal : ".";
-
- // splice out anything not part of a number
- var pattern = "[^" + dec + "\\deE+-]";
- value = value.replace(RegExp(pattern, "g"), "");
-
- // trim ends of things like e, E, or the decimal character
- value = value.replace(/^([+-]?)(\D*)/, "$1");
- value = value.replace(/(\D*)$/, "");
-
- // replace decimal with ".". The minus sign '-' could be the decimal!
- pattern = "(\\d)[" + dec + "](\\d)";
- value = value.replace(RegExp(pattern, "g"), "$1.$2");
-
- value = Number(value);
- if ( value < min || value > max ) { return false; }
-
- return true;
-}
-
-/**
- Validates a time value in any International format.
- The value can be validated against one format or one of multiple formats.
-
- Format
- h 12 hour, no zero padding.
- hh 12 hour, has leading zero.
- H 24 hour, no zero padding.
- HH 24 hour, has leading zero.
- m minutes, no zero padding.
- mm minutes, has leading zero.
- s seconds, no zero padding.
- ss seconds, has leading zero.
- All other characters must appear literally in the expression.
-
- Example
- "h:m:s t" -> 2:5:33 PM
- "HH:mm:ss" -> 14:05:33
-
- @param value A string.
- @param flags An object.
- flags.format A string or an array of strings. Default is "h:mm:ss t".
- flags.amSymbol The symbol used for AM. Default is "AM".
- flags.pmSymbol The symbol used for PM. Default is "PM".
- @return true or false
-*/
-dojo.validate.isValidTime = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.time(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Validates 12-hour time format.
- Zero-padding is not allowed for hours, required for minutes and seconds.
- Seconds are optional.
-
- @param value A string.
- @return true or false
-*/
-dojo.validate.is12HourTime = function(value) {
- return dojo.validate.isValidTime(value, {format: ["h:mm:ss t", "h:mm t"]});
-}
-
-/**
- Validates 24-hour military time format.
- Zero-padding is required for hours, minutes, and seconds.
- Seconds are optional.
-
- @param value A string.
- @return true or false
-*/
-dojo.validate.is24HourTime = function(value) {
- return dojo.validate.isValidTime(value, {format: ["HH:mm:ss", "HH:mm"]} );
-}
-
-/**
- Returns true if the date conforms to the format given and is a valid date. Otherwise returns false.
-
- @param dateValue A string for the date.
- @param format A string, default is "MM/DD/YYYY".
- @return true or false
-
- Accepts any type of format, including ISO8601.
- All characters in the format string are treated literally except the following tokens:
-
- YYYY - matches a 4 digit year
- M - matches a non zero-padded month
- MM - matches a zero-padded month
- D - matches a non zero-padded date
- DD - matches a zero-padded date
- DDD - matches an ordinal date, 001-365, and 366 on leapyear
- ww - matches week of year, 01-53
- d - matches day of week, 1-7
-
- Examples: These are all today's date.
-
- Date Format
- 2005-W42-3 YYYY-Www-d
- 2005-292 YYYY-DDD
- 20051019 YYYYMMDD
- 10/19/2005 M/D/YYYY
- 19.10.2005 D.M.YYYY
-*/
-dojo.validate.isValidDate = function(dateValue, format) {
- // Default is the American format
- if (typeof format != "string") { format = "MM/DD/YYYY"; }
-
- // Create a literal regular expression based on format
- var reLiteral = format.replace(/([$^.*+?=!:|\/\\\(\)\[\]\{\}])/g, "\\$1");
-
- // Convert all the tokens to RE elements
- reLiteral = reLiteral.replace( "YYYY", "([0-9]{4})" );
- reLiteral = reLiteral.replace( "MM", "(0[1-9]|10|11|12)" );
- reLiteral = reLiteral.replace( "M", "([1-9]|10|11|12)" );
- reLiteral = reLiteral.replace( "DDD", "(00[1-9]|0[1-9][0-9]|[12][0-9][0-9]|3[0-5][0-9]|36[0-6])" );
- reLiteral = reLiteral.replace( "DD", "(0[1-9]|[12][0-9]|30|31)" );
- reLiteral = reLiteral.replace( "D", "([1-9]|[12][0-9]|30|31)" );
- reLiteral = reLiteral.replace( "ww", "(0[1-9]|[1-4][0-9]|5[0-3])" );
- reLiteral = reLiteral.replace( "d", "([1-7])" );
-
- // Anchor pattern to begining and end of string
- reLiteral = "^" + reLiteral + "$";
-
- // Dynamic RE that parses the original format given
- var re = new RegExp(reLiteral);
-
- // Test if date is in a valid format
- if (!re.test(dateValue)) return false;
-
- // Parse date to get elements and check if date is valid
- // Assume valid values for date elements not given.
- var year = 0, month = 1, date = 1, dayofyear = 1, week = 1, day = 1;
-
- // Capture tokens
- var tokens = format.match( /(YYYY|MM|M|DDD|DD|D|ww|d)/g );
-
- // Capture date values
- var values = re.exec(dateValue);
-
- // Match up tokens with date values
- for (var i = 0; i < tokens.length; i++) {
- switch (tokens[i]) {
- case "YYYY":
- year = Number(values[i+1]); break;
- case "M":
- case "MM":
- month = Number(values[i+1]); break;
- case "D":
- case "DD":
- date = Number(values[i+1]); break;
- case "DDD":
- dayofyear = Number(values[i+1]); break;
- case "ww":
- week = Number(values[i+1]); break;
- case "d":
- day = Number(values[i+1]); break;
- }
- }
-
- // Leap years are divisible by 4, but not by 100, unless by 400
- var leapyear = (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
-
- // 31st of a month with 30 days
- if (date == 31 && (month == 4 || month == 6 || month == 9 || month == 11)) return false;
-
- // February 30th or 31st
- if (date >= 30 && month == 2) return false;
-
- // February 29th outside a leap year
- if (date == 29 && month == 2 && !leapyear) return false;
- if (dayofyear == 366 && !leapyear) return false;
-
- return true;
-}
-
-/**
- Validates US state and territory abbreviations.
-
- @param value A two character string.
- @param flags An object.
- flags.allowTerritories Allow Guam, Puerto Rico, etc. Default is true.
- flags.allowMilitary Allow military 'states', e.g. Armed Forces Europe (AE). Default is true.
- @return true or false
-*/
-dojo.validate.us.isState = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.us.state(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Validates any sort of number based format.
- Use it for phone numbers, social security numbers, zip-codes, etc.
- The value can be validated against one format or one of multiple formats.
-
- Format
- # Stands for a digit, 0-9.
- ? Stands for an optional digit, 0-9 or nothing.
- All other characters must appear literally in the expression.
-
- Example
- "(###) ###-####" -> (510) 542-9742
- "(###) ###-#### x#???" -> (510) 542-9742 x153
- "###-##-####" -> 506-82-1089 i.e. social security number
- "#####-####" -> 98225-1649 i.e. zip code
-
- @param value A string.
- @param flags An object.
- flags.format A string or an Array of strings for multiple formats.
- @return true or false
-*/
-dojo.validate.isNumberFormat = function(value, flags) {
- var re = new RegExp("^" + dojo.regexp.numberFormat(flags) + "$", "i");
- return re.test(value);
-}
-
-/**
- Validates 10 US digit phone number for several common formats:
-
- @param value The telephone number string
- @return true or false
-*/
-dojo.validate.us.isPhoneNumber = function(value) {
- flags = {
- format: [
- "###-###-####",
- "(###) ###-####",
- "(###) ### ####",
- "###.###.####",
- "###/###-####",
- "### ### ####",
- "###-###-#### x#???",
- "(###) ###-#### x#???",
- "(###) ### #### x#???",
- "###.###.#### x#???",
- "###/###-#### x#???",
- "### ### #### x#???"
- ]
- };
-
- return dojo.validate.isNumberFormat(value, flags);
-}
-
-// Validates social security number
-dojo.validate.us.isSocialSecurityNumber = function(value) {
- flags = {
- format: [
- "###-##-####",
- "### ## ####",
- "#########"
- ]
- };
-
- return dojo.validate.isNumberFormat(value, flags);
-}
-
-// Validates U.S. zip-code
-dojo.validate.us.isZipCode = function(value) {
- flags = {
- format: [
- "#####-####",
- "##### ####",
- "#########",
- "#####"
- ]
- };
-
- return dojo.validate.isNumberFormat(value, flags);
-}
-
-
-/**
- Procedural API Description
-
- The main aim is to make input validation expressible in a simple format.
- You define profiles which declare the required and optional fields and any constraints they might have.
- The results are provided as an object that makes it easy to handle missing and invalid input.
-
- Usage
-
- var results = dojo.validate.check(form, profile);
-
- Profile Object
-
- var profile = {
- // filters change the field value and are applied before validation.
- trim: ["tx1", "tx2"],
- uppercase: ["tx9"],
- lowercase: ["tx5", "tx6", "tx7"],
- ucfirst: ["tx10"],
- digit: ["tx11"],
-
- // required input fields that are blank will be reported missing.
- // required radio button groups and drop-down lists with no selection will be reported missing.
- // checkbox groups and selectboxes can be required to have more than one value selected.
- // List required fields by name and use this notation to require more than one value: {checkboxgroup: 2}, {selectboxname: 3}.
- required: ["tx7", "tx8", "pw1", "ta1", "rb1", "rb2", "cb3", "s1", {"doubledip":2}, {"tripledip":3}],
-
- // dependant/conditional fields are required if the target field is present and not blank.
- // At present only textbox, password, and textarea fields are supported.
- dependancies: {
- cc_exp: "cc_no",
- cc_type: "cc_no",
- },
-
- // Fields can be validated using any boolean valued function.
- // Use arrays to specify parameters in addition to the field value.
- constraints: {
- field_name1: myValidationFunction,
- field_name2: dojo.validate.isInteger,
- field_name3: [myValidationFunction, additional parameters],
- field_name4: [dojo.validate.isValidDate, "YYYY.MM.DD"],
- field_name5: [dojo.validate.isEmailAddress, false, true],
- },
-
- // Confirm is a sort of conditional validation.
- // It associates each field in its property list with another field whose value should be equal.
- // If the values are not equal, the field in the property list is reported as Invalid. Unless the target field is blank.
- confirm: {
- email_confirm: "email",
- pw2: "pw1",
- }
- };
-
- Results Object
-
- isSuccessful(): Returns true if there were no invalid or missing fields, else it returns false.
- hasMissing(): Returns true if the results contain any missing fields.
- getMissing(): Returns a list of required fields that have values missing.
- isMissing(field): Returns true if the field is required and the value is missing.
- hasInvalid(): Returns true if the results contain fields with invalid data.
- getInvalid(): Returns a list of fields that have invalid values.
- isInvalid(field): Returns true if the field has an invalid value.
-
-*/
-
-/**
- Validates user input of an HTML form based on input profile.
-
- @param form The form object to be validated.
- @param profile The input profile that specifies how the form fields are to be validated.
- @return results An object that contains several methods summarizing the results of the validation.
-*/
-dojo.validate.check = function(form, profile) {
- // Essentially private properties of results object
- var missing = [];
- var invalid = [];
-
- // results object summarizes the validation
- var results = {
- isSuccessful: function() {return ( !this.hasInvalid() && !this.hasMissing() );},
- hasMissing: function() {return ( missing.length > 0 );},
- getMissing: function() {return missing;},
- isMissing: function(elemname) {
- for (var i = 0; i < missing.length; i++) {
- if ( elemname == missing[i] ) { return true; }
- }
- return false;
- },
- hasInvalid: function() {return ( invalid.length > 0 );},
- getInvalid: function() {return invalid;},
- isInvalid: function(elemname) {
- for (var i = 0; i < invalid.length; i++) {
- if ( elemname == invalid[i] ) { return true; }
- }
- return false;
- }
- };
-
- // Filters are applied before fields are validated.
- // Trim removes white space at the front and end of the fields.
- if ( profile.trim instanceof Array ) {
- for (var i = 0; i < profile.trim.length; i++) {
- var elem = form[profile.trim[i]];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- elem.value = elem.value.replace(/(^\s*|\s*$)/g, "");
- }
- }
- // Convert to uppercase
- if ( profile.uppercase instanceof Array ) {
- for (var i = 0; i < profile.uppercase.length; i++) {
- var elem = form[profile.uppercase[i]];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- elem.value = elem.value.toUpperCase();
- }
- }
- // Convert to lowercase
- if ( profile.lowercase instanceof Array ) {
- for (var i = 0; i < profile.lowercase.length; i++) {
- var elem = form[profile.lowercase[i]];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- elem.value = elem.value.toLowerCase();
- }
- }
- // Uppercase first letter
- if ( profile.ucfirst instanceof Array ) {
- for (var i = 0; i < profile.ucfirst.length; i++) {
- var elem = form[profile.ucfirst[i]];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- elem.value = elem.value.replace(/\b\w+\b/g, function(word) { return word.substring(0,1).toUpperCase() + word.substring(1).toLowerCase(); });
- }
- }
- // Remove non digits characters from the input.
- if ( profile.digit instanceof Array ) {
- for (var i = 0; i < profile.digit.length; i++) {
- var elem = form[profile.digit[i]];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- elem.value = elem.value.replace(/\D/g, "");
- }
- }
-
- // See if required input fields have values missing.
- if ( profile.required instanceof Array ) {
- for (var i = 0; i < profile.required.length; i++) {
- if ( typeof profile.required[i] != "string" ) { continue; }
- var elem = form[profile.required[i]];
- // Are textbox, textarea, or password fields blank.
- if ( (elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value) ) {
- missing[missing.length] = elem.name;
- }
- // Does drop-down box have option selected.
- else if ( (elem.type == "select-one" || elem.type == "select-multiple") && elem.selectedIndex == -1 ) {
- missing[missing.length] = elem.name;
- }
- // Does radio button group (or check box group) have option checked.
- else if ( elem instanceof Array ) {
- var checked = false;
- for (var j = 0; j < elem.length; j++) {
- if (elem[j].checked) { checked = true; }
- }
- if ( !checked ) {
- missing[missing.length] = elem[0].name;
- }
- }
- }
- }
-
- // See if checkbox groups and select boxes have x number of required values.
- if ( profile.required instanceof Array ) {
- for (var i = 0; i < profile.required.length; i++) {
- if ( typeof profile.required[i] != "object" ) { continue; }
- var elem, numRequired;
- for (var name in profile.required[i]) {
- elem = form[name];
- numRequired = profile.required[i][name];
- }
- // case 1: elem is a check box group
- if ( elem instanceof Array ) {
- var checked = 0;
- for (var j = 0; j < elem.length; j++) {
- if (elem[j].checked) { checked++; }
- }
- if ( checked < numRequired ) {
- missing[missing.length] = elem[0].name;
- }
- }
- // case 2: elem is a select box
- else if ( elem.type == "select-multiple" ) {
- var selected = 0;
- for (var j = 0; j < elem.options.length; j++) {
- if (elem.options[j].selected) { selected++; }
- }
- if ( selected < numRequired ) {
- missing[missing.length] = elem.name;
- }
- }
- }
- }
-
- // Dependant fields are required when the target field is present (not blank).
- // Todo: Support dependant and target fields that are radio button groups, or select drop-down lists.
- // Todo: Make the dependancy based on a specific value of the target field.
- // Todo: allow dependant fields to have several required values, like {checkboxgroup: 3}.
- if ( typeof profile.dependancies == "object" ) {
- // properties of dependancies object are the names of dependant fields to be checked
- for (name in profile.dependancies) {
- var elem = form[name]; // the dependant element
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; } // limited support
- if ( /\S+/.test(elem.value) ) { continue; } // has a value already
- if ( results.isMissing(elem.name) ) { continue; } // already listed as missing
- var target = form[profile.dependancies[name]];
- if ( target.type != "text" && target.type != "textarea" && target.type != "password" ) { continue; } // limited support
- if ( /^\s*$/.test(target.value) ) { continue; } // skip if blank
- missing[missing.length] = elem.name; // ok the dependant field is missing
- }
- }
-
- // Find invalid input fields.
- if ( typeof profile.constraints == "object" ) {
- // constraint properties are the names of fields to be validated
- for (name in profile.constraints) {
- var elem = form[name];
- if ( elem.type != "text" && elem.type != "textarea" && elem.type != "password" ) { continue; }
- // skip if blank - its optional unless required, in which case it is already listed as missing.
- if ( /^\s*$/.test(elem.value) ) { continue; }
-
- var isValid = true;
- // case 1: constraint value is validation function
- if ( typeof profile.constraints[name] == "function" ) {
- isValid = profile.constraints[name](elem.value);
- }
- // case 2: constraint value is array, first elem is function, tail is parameters
- else if ( profile.constraints[name] instanceof Array ) {
- var isValidSomething = profile.constraints[name][0];
- var params = profile.constraints[name].slice(1);
- params.unshift(elem.value);
- isValid = isValidSomething.apply(null, params);
- }
-
- if ( !isValid ) {
- invalid[invalid.length] = elem.name;
- }
- }
- }
-
- // Find unequal confirm fields and report them as Invalid.
- if ( typeof profile.confirm == "object" ) {
- for (name in profile.confirm) {
- var elem = form[name]; // the confirm element
- var target = form[profile.confirm[name]];
- if ( (elem.type != "text" && elem.type != "textarea" && elem.type != "password")
- || target.type != elem.type
- || target.value == elem.value // it's valid
- || results.isInvalid(elem.name) // already listed as invalid
- || /^\s*$/.test(target.value) ) // skip if blank - only confirm if target has a value
- {
- continue;
- }
- invalid[invalid.length] = elem.name;
- }
- }
-
- return results;
-}
+dojo.require("dojo.validate.common");
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/__package__.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/__package__.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/__package__.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/__package__.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,21 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.require("dojo.validate");
+dojo.kwCompoundRequire({
+ common: ["dojo.validate.check",
+ "dojo.validate.datetime",
+ "dojo.validate.de",
+ "dojo.validate.jp",
+ "dojo.validate.us",
+ "dojo.validate.web"
+ ]
+});
+dojo.provide("dojo.validate.*");
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/check.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/check.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/check.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/check.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,263 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.check");
+dojo.require("dojo.validate.common");
+dojo.require("dojo.lang.common");
+
+dojo.validate.check = function(/*HTMLFormElement*/form, /*Object*/profile){
+ // summary: validates user input of an HTML form based on input profile
+ //
+ // description:
+ // returns an object that contains several methods summarizing the results of the validation
+ //
+ // form: form to be validated
+ // profile: specifies how the form fields are to be validated
+ // {trim:Array, uppercase:Array, lowercase:Array, ucfirst:Array, digit:Array,
+ // required:Array, dependencies:Object, constraints:Object, confirm:Object}
+
+ // Essentially private properties of results object
+ var missing = [];
+ var invalid = [];
+
+ // results object summarizes the validation
+ var results = {
+ isSuccessful: function() {return ( !this.hasInvalid() && !this.hasMissing() );},
+ hasMissing: function() {return ( missing.length > 0 );},
+ getMissing: function() {return missing;},
+ isMissing: function(elemname) {
+ for(var i = 0; i < missing.length; i++){
+ if(elemname == missing[i]){ return true; }
+ }
+ return false;
+ },
+ hasInvalid: function() {return ( invalid.length > 0 );},
+ getInvalid: function() {return invalid;},
+ isInvalid: function(elemname){
+ for(var i = 0; i < invalid.length; i++){
+ if(elemname == invalid[i]){ return true; }
+ }
+ return false;
+ }
+ };
+
+ // Filters are applied before fields are validated.
+ // Trim removes white space at the front and end of the fields.
+ if(profile.trim instanceof Array){
+ for(var i = 0; i < profile.trim.length; i++){
+ var elem = form[profile.trim[i]];
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
+ elem.value = elem.value.replace(/(^\s*|\s*$)/g, "");
+ }
+ }
+ // Convert to uppercase
+ if(profile.uppercase instanceof Array){
+ for(var i = 0; i < profile.uppercase.length; i++){
+ var elem = form[profile.uppercase[i]];
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
+ elem.value = elem.value.toUpperCase();
+ }
+ }
+ // Convert to lowercase
+ if(profile.lowercase instanceof Array){
+ for (var i = 0; i < profile.lowercase.length; i++){
+ var elem = form[profile.lowercase[i]];
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
+ elem.value = elem.value.toLowerCase();
+ }
+ }
+ // Uppercase first letter
+ if(profile.ucfirst instanceof Array){
+ for(var i = 0; i < profile.ucfirst.length; i++){
+ var elem = form[profile.ucfirst[i]];
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
+ elem.value = elem.value.replace(/\b\w+\b/g, function(word) { return word.substring(0,1).toUpperCase() + word.substring(1).toLowerCase(); });
+ }
+ }
+ // Remove non digits characters from the input.
+ if(profile.digit instanceof Array){
+ for(var i = 0; i < profile.digit.length; i++){
+ var elem = form[profile.digit[i]];
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; }
+ elem.value = elem.value.replace(/\D/g, "");
+ }
+ }
+
+ // See if required input fields have values missing.
+ if(profile.required instanceof Array){
+ for(var i = 0; i < profile.required.length; i++){
+ if(!dojo.lang.isString(profile.required[i])){ continue; }
+ var elem = form[profile.required[i]];
+ // Are textbox, textarea, or password fields blank.
+ if((elem.type == "text" || elem.type == "textarea" || elem.type == "password") && /^\s*$/.test(elem.value)){
+ missing[missing.length] = elem.name;
+ }
+ // Does drop-down box have option selected.
+ else if((elem.type == "select-one" || elem.type == "select-multiple")
+ && (elem.selectedIndex == -1
+ || /^\s*$/.test(elem.options[elem.selectedIndex].value))){
+ missing[missing.length] = elem.name;
+ }
+ // Does radio button group (or check box group) have option checked.
+ else if(elem instanceof Array){
+ var checked = false;
+ for(var j = 0; j < elem.length; j++){
+ if (elem[j].checked) { checked = true; }
+ }
+ if(!checked){
+ missing[missing.length] = elem[0].name;
+ }
+ }
+ }
+ }
+
+ // See if checkbox groups and select boxes have x number of required values.
+ if(profile.required instanceof Array){
+ for (var i = 0; i < profile.required.length; i++){
+ if(!dojo.lang.isObject(profile.required[i])){ continue; }
+ var elem, numRequired;
+ for(var name in profile.required[i]){
+ elem = form[name];
+ numRequired = profile.required[i][name];
+ }
+ // case 1: elem is a check box group
+ if(elem instanceof Array){
+ var checked = 0;
+ for(var j = 0; j < elem.length; j++){
+ if(elem[j].checked){ checked++; }
+ }
+ if(checked < numRequired){
+ missing[missing.length] = elem[0].name;
+ }
+ }
+ // case 2: elem is a select box
+ else if(elem.type == "select-multiple" ){
+ var selected = 0;
+ for(var j = 0; j < elem.options.length; j++){
+ if (elem.options[j].selected && !/^\s*$/.test(elem.options[j].value)) { selected++; }
+ }
+ if(selected < numRequired){
+ missing[missing.length] = elem.name;
+ }
+ }
+ }
+ }
+
+ // Dependent fields are required when the target field is present (not blank).
+ // Todo: Support dependent and target fields that are radio button groups, or select drop-down lists.
+ // Todo: Make the dependency based on a specific value of the target field.
+ // Todo: allow dependent fields to have several required values, like {checkboxgroup: 3}.
+ if(dojo.lang.isObject(profile.dependencies) || dojo.lang.isObject(profile.dependancies)){
+ if(profile["dependancies"]){
+ dojo.deprecated("dojo.validate.check", "profile 'dependancies' is deprecated, please use "
+ + "'dependencies'", "0.5");
+ profile.dependencies=profile.dependancies;
+ }
+ // properties of dependencies object are the names of dependent fields to be checked
+ for(name in profile.dependencies){
+ var elem = form[name]; // the dependent element
+ if(elem.type != "text" && elem.type != "textarea" && elem.type != "password"){ continue; } // limited support
+ if(/\S+/.test(elem.value)){ continue; } // has a value already
+ if(results.isMissing(elem.name)){ continue; } // already listed as missing
+ var target = form[profile.dependencies[name]];
+ if(target.type != "text" && target.type != "textarea" && target.type != "password"){ continue; } // limited support
+ if(/^\s*$/.test(target.value)){ continue; } // skip if blank
+ missing[missing.length] = elem.name; // ok the dependent field is missing
+ }
+ }
+
+ // Find invalid input fields.
+ if(dojo.lang.isObject(profile.constraints)){
+ // constraint properties are the names of fields to bevalidated
+ for(name in profile.constraints){
+ var elem = form[name];
+ if( (elem.type != "text")&&
+ (elem.type != "textarea")&&
+ (elem.type != "password")){
+ continue;
+ }
+ // skip if blank - its optional unless required, in which case it
+ // is already listed as missing.
+ if(/^\s*$/.test(elem.value)){ continue; }
+
+ var isValid = true;
+ // case 1: constraint value is validation function
+ if(dojo.lang.isFunction(profile.constraints[name])){
+ isValid = profile.constraints[name](elem.value);
+ }else if(dojo.lang.isArray(profile.constraints[name])){
+ // handle nested arrays for multiple constraints
+ if(dojo.lang.isArray(profile.constraints[name][0])){
+ for (var i=0; i<profile.constraints[name].length; i++){
+ isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name][i], name, elem);
+ if(!isValid){ break; }
+ }
+ }else{
+ // case 2: constraint value is array, first elem is function,
+ // tail is parameters
+ isValid = dojo.validate.evaluateConstraint(profile, profile.constraints[name], name, elem);
+ }
+ }
+
+ if(!isValid){
+ invalid[invalid.length] = elem.name;
+ }
+ }
+ }
+
+ // Find unequal confirm fields and report them as Invalid.
+ if(dojo.lang.isObject(profile.confirm)){
+ for(name in profile.confirm){
+ var elem = form[name]; // the confirm element
+ var target = form[profile.confirm[name]];
+ if ( (elem.type != "text" && elem.type != "textarea" && elem.type != "password")
+ ||(target.type != elem.type)
+ ||(target.value == elem.value) // it's valid
+ ||(results.isInvalid(elem.name))// already listed as invalid
+ ||(/^\s*$/.test(target.value))) // skip if blank - only confirm if target has a value
+ {
+ continue;
+ }
+ invalid[invalid.length] = elem.name;
+ }
+ }
+
+ return results; // Object
+}
+
+//TODO: evaluateConstraint doesn't use profile or fieldName args?
+dojo.validate.evaluateConstraint=function(profile, /*Array*/constraint, fieldName, elem){
+ // summary:
+ // Evaluates dojo.validate.check() constraints that are specified as array
+ // arguments
+ //
+ // description: The arrays are expected to be in the format of:
+ // constraints:{
+ // fieldName: [functionToCall, param1, param2, etc.],
+ // fieldName: [[functionToCallFirst, param1],[functionToCallSecond,param2]]
+ // }
+ //
+ // This function evaluates a single array function in the format of:
+ // [functionName, argument1, argument2, etc]
+ //
+ // The function will be parsed out and evaluated against the incoming parameters.
+ //
+ // profile: The dojo.validate.check() profile that this evaluation is against.
+ // constraint: The single [] array of function and arguments for the function.
+ // fieldName: The form dom name of the field being validated.
+ // elem: The form element field.
+
+ var isValidSomething = constraint[0];
+ var params = constraint.slice(1);
+ params.unshift(elem.value);
+ if(typeof isValidSomething != "undefined"){
+ return isValidSomething.apply(null, params);
+ }
+ return false; // Boolean
+}
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/check.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/common.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/common.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/common.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/common.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,248 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.common");
+
+dojo.require("dojo.regexp");
+
+
+dojo.validate.isText = function(/*String*/value, /*Object?*/flags){
+// summary:
+// Checks if a string has non whitespace characters.
+// Parameters allow you to constrain the length.
+//
+// value: A string
+// flags: {length: Number, minlength: Number, maxlength: Number}
+// flags.length If set, checks if there are exactly flags.length number of characters.
+// flags.minlength If set, checks if there are at least flags.minlength number of characters.
+// flags.maxlength If set, checks if there are at most flags.maxlength number of characters.
+
+ flags = (typeof flags == "object") ? flags : {};
+
+ // test for text
+ if(/^\s*$/.test(value)){ return false; } // Boolean
+
+ // length tests
+ if(typeof flags.length == "number" && flags.length != value.length){ return false; } // Boolean
+ if(typeof flags.minlength == "number" && flags.minlength > value.length){ return false; } // Boolean
+ if(typeof flags.maxlength == "number" && flags.maxlength < value.length){ return false; } // Boolean
+
+ return true; // Boolean
+}
+
+dojo.validate.isInteger = function(/*String*/value, /*Object?*/flags){
+// summary:
+// Validates whether a string is in an integer format
+//
+// value A string
+// flags {signed: Boolean|[true,false], separator: String}
+// flags.signed The leading plus-or-minus sign. Can be true, false, or [true, false].
+// Default is [true, false], (i.e. sign is optional).
+// flags.separator The character used as the thousands separator. Default is no separator.
+// For more than one symbol use an array, e.g. [",", ""], makes ',' optional.
+
+ var re = new RegExp("^" + dojo.regexp.integer(flags) + "$");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isRealNumber = function(/*String*/value, /*Object?*/flags){
+// summary:
+// Validates whether a string is a real valued number.
+// Format is the usual exponential notation.
+//
+// value: A string
+// flags: {places: Number, decimal: String, exponent: Boolean|[true,false], eSigned: Boolean|[true,false], ...}
+// flags.places The integer number of decimal places.
+// If not given, the decimal part is optional and the number of places is unlimited.
+// flags.decimal The character used for the decimal point. Default is ".".
+// flags.exponent Express in exponential notation. Can be true, false, or [true, false].
+// Default is [true, false], (i.e. the exponential part is optional).
+// flags.eSigned The leading plus-or-minus sign on the exponent. Can be true, false,
+// or [true, false]. Default is [true, false], (i.e. sign is optional).
+// flags in regexp.integer can be applied.
+
+ var re = new RegExp("^" + dojo.regexp.realNumber(flags) + "$");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isCurrency = function(/*String*/value, /*Object?*/flags){
+// summary:
+// Validates whether a string denotes a monetary value.
+// value: A string
+// flags: {signed:Boolean|[true,false], symbol:String, placement:String, separator:String,
+// fractional:Boolean|[true,false], decimal:String}
+// flags.signed The leading plus-or-minus sign. Can be true, false, or [true, false].
+// Default is [true, false], (i.e. sign is optional).
+// flags.symbol A currency symbol such as Yen "�", Pound "�", or the Euro sign "�".
+// Default is "$". For more than one symbol use an array, e.g. ["$", ""], makes $ optional.
+// flags.placement The symbol can come "before" the number or "after". Default is "before".
+// flags.separator The character used as the thousands separator. The default is ",".
+// flags.fractional The appropriate number of decimal places for fractional currency (e.g. cents)
+// Can be true, false, or [true, false]. Default is [true, false], (i.e. cents are optional).
+// flags.decimal The character used for the decimal point. Default is ".".
+
+ var re = new RegExp("^" + dojo.regexp.currency(flags) + "$");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isInRange = function(/*String*/value, /*Object?*/flags){
+//summary:
+// Validates whether a string denoting an integer,
+// real number, or monetary value is between a max and min.
+//
+// value: A string
+// flags: {max:Number, min:Number, decimal:String}
+// flags.max A number, which the value must be less than or equal to for the validation to be true.
+// flags.min A number, which the value must be greater than or equal to for the validation to be true.
+// flags.decimal The character used for the decimal point. Default is ".".
+
+ //stripping the seperator allows NaN to perform as expected, if no separator, we assume ','
+ //once i18n support is ready for this, instead of assuming, we default to i18n's recommended value
+ value = value.replace((dojo.lang.has(flags,'separator'))?flags.separator:',','');
+ if(isNaN(value)){
+ return false; // Boolean
+ }
+ // assign default values to missing paramters
+ flags = (typeof flags == "object") ? flags : {};
+ var max = (typeof flags.max == "number") ? flags.max : Infinity;
+ var min = (typeof flags.min == "number") ? flags.min : -Infinity;
+ var dec = (typeof flags.decimal == "string") ? flags.decimal : ".";
+
+ // splice out anything not part of a number
+ var pattern = "[^" + dec + "\\deE+-]";
+ value = value.replace(RegExp(pattern, "g"), "");
+
+ // trim ends of things like e, E, or the decimal character
+ value = value.replace(/^([+-]?)(\D*)/, "$1");
+ value = value.replace(/(\D*)$/, "");
+
+ // replace decimal with ".". The minus sign '-' could be the decimal!
+ pattern = "(\\d)[" + dec + "](\\d)";
+ value = value.replace(RegExp(pattern, "g"), "$1.$2");
+
+ value = Number(value);
+ if ( value < min || value > max ) { return false; } // Boolean
+
+ return true; // Boolean
+}
+
+dojo.validate.isNumberFormat = function(/*String*/value, /*Object?*/flags){
+// summary:
+// Validates any sort of number based format
+//
+// description:
+// Use it for phone numbers, social security numbers, zip-codes, etc.
+// The value can be validated against one format or one of multiple formats.
+//
+// Format
+// # Stands for a digit, 0-9.
+// ? Stands for an optional digit, 0-9 or nothing.
+// All other characters must appear literally in the expression.
+//
+// Example
+// "(###) ###-####" -> (510) 542-9742
+// "(###) ###-#### x#???" -> (510) 542-9742 x153
+// "###-##-####" -> 506-82-1089 i.e. social security number
+// "#####-####" -> 98225-1649 i.e. zip code
+//
+// value: A string
+// flags: {format:String}
+// flags.format A string or an Array of strings for multiple formats.
+
+ var re = new RegExp("^" + dojo.regexp.numberFormat(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isValidLuhn = function(/*String*/value){
+//summary: Compares value against the Luhn algorithm to verify its integrity
+ var sum, parity, curDigit;
+ if(typeof value!='string'){
+ value = String(value);
+ }
+ value = value.replace(/[- ]/g,''); //ignore dashes and whitespaces
+ parity = value.length%2;
+ sum=0;
+ for(var i=0;i<value.length;i++){
+ curDigit = parseInt(value.charAt(i));
+ if(i%2==parity){
+ curDigit*=2;
+ }
+ if(curDigit>9){
+ curDigit-=9;
+ }
+ sum+=curDigit;
+ }
+ return !(sum%10);
+}
+
+/**
+ Procedural API Description
+
+ The main aim is to make input validation expressible in a simple format.
+ You define profiles which declare the required and optional fields and any constraints they might have.
+ The results are provided as an object that makes it easy to handle missing and invalid input.
+
+ Usage
+
+ var results = dojo.validate.check(form, profile);
+
+ Profile Object
+
+ var profile = {
+ // filters change the field value and are applied before validation.
+ trim: ["tx1", "tx2"],
+ uppercase: ["tx9"],
+ lowercase: ["tx5", "tx6", "tx7"],
+ ucfirst: ["tx10"],
+ digit: ["tx11"],
+
+ // required input fields that are blank will be reported missing.
+ // required radio button groups and drop-down lists with no selection will be reported missing.
+ // checkbox groups and selectboxes can be required to have more than one value selected.
+ // List required fields by name and use this notation to require more than one value: {checkboxgroup: 2}, {selectboxname: 3}.
+ required: ["tx7", "tx8", "pw1", "ta1", "rb1", "rb2", "cb3", "s1", {"doubledip":2}, {"tripledip":3}],
+
+ // dependant/conditional fields are required if the target field is present and not blank.
+ // At present only textbox, password, and textarea fields are supported.
+ dependencies: {
+ cc_exp: "cc_no",
+ cc_type: "cc_no",
+ },
+
+ // Fields can be validated using any boolean valued function.
+ // Use arrays to specify parameters in addition to the field value.
+ constraints: {
+ field_name1: myValidationFunction,
+ field_name2: dojo.validate.isInteger,
+ field_name3: [myValidationFunction, additional parameters],
+ field_name4: [dojo.validate.isValidDate, "YYYY.MM.DD"],
+ field_name5: [dojo.validate.isEmailAddress, false, true],
+ },
+
+ // Confirm is a sort of conditional validation.
+ // It associates each field in its property list with another field whose value should be equal.
+ // If the values are not equal, the field in the property list is reported as Invalid. Unless the target field is blank.
+ confirm: {
+ email_confirm: "email",
+ pw2: "pw1",
+ }
+ };
+
+ Results Object
+
+ isSuccessful(): Returns true if there were no invalid or missing fields, else it returns false.
+ hasMissing(): Returns true if the results contain any missing fields.
+ getMissing(): Returns a list of required fields that have values missing.
+ isMissing(field): Returns true if the field is required and the value is missing.
+ hasInvalid(): Returns true if the results contain fields with invalid data.
+ getInvalid(): Returns a list of fields that have invalid values.
+ isInvalid(field): Returns true if the field has an invalid value.
+
+*/
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/common.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/creditCard.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/creditCard.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/creditCard.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/creditCard.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,90 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide('dojo.validate.creditCard');
+
+dojo.require("dojo.lang.common");
+dojo.require("dojo.validate.common");
+
+/*
+ Validates Credit Cards using account number rules in conjunction with the Luhn algorightm
+
+ */
+
+dojo.validate.isValidCreditCard = function(value,ccType){
+ //checks if type matches the # scheme, and if Luhn checksum is accurate (unless its an Enroute card, the checkSum is skipped)
+ if(value&&ccType&&((ccType.toLowerCase()=='er'||dojo.validate.isValidLuhn(value))&&(dojo.validate.isValidCreditCardNumber(value,ccType.toLowerCase())))){
+ return true;
+ }
+ return false;
+}
+dojo.validate.isValidCreditCardNumber = function(value,ccType) {
+ //only checks if the # matches the pattern for that card or any card types if none is specified
+ //value == CC #, white spaces and dashes are ignored
+ //ccType is of the values in cardinfo -- if Omitted it it returns a | delimited string of matching card types, or false if no matches found
+ if(typeof value!='string'){
+ value = String(value);
+ }
+ value = value.replace(/[- ]/g,''); //ignore dashes and whitespaces
+ /* FIXME: not sure on all the abbreviations for credit cards,below is what each stands for atleast to my knowledge
+ mc: Mastercard
+ ec: Eurocard
+ vi: Visa
+ ax: American Express
+ dc: Diners Club
+ bl: Carte Blanch
+ di: Discover
+ jcb: JCB
+ er: Enroute
+ */
+ var results=[];
+ var cardinfo = {
+ 'mc':'5[1-5][0-9]{14}','ec':'5[1-5][0-9]{14}','vi':'4([0-9]{12}|[0-9]{15})',
+ 'ax':'3[47][0-9]{13}', 'dc':'3(0[0-5][0-9]{11}|[68][0-9]{12})',
+ 'bl':'3(0[0-5][0-9]{11}|[68][0-9]{12})','di':'6011[0-9]{12}',
+ 'jcb':'(3[0-9]{15}|(2131|1800)[0-9]{11})','er':'2(014|149)[0-9]{11}'
+ };
+ if(ccType&&dojo.lang.has(cardinfo,ccType.toLowerCase())){
+ return Boolean(value.match(cardinfo[ccType.toLowerCase()])); // boolean
+ }else{
+ for(var p in cardinfo){
+ if(value.match('^'+cardinfo[p]+'$')!=null){
+ results.push(p);
+ }
+ }
+ return (results.length)?results.join('|'):false; // string | boolean
+ }
+}
+
+dojo.validate.isValidCvv = function(value, ccType) {
+ if(typeof value!='string'){
+ value=String(value);
+ }
+ var format;
+ switch (ccType.toLowerCase()){
+ case 'mc':
+ case 'ec':
+ case 'vi':
+ case 'di':
+ format = '###';
+ break;
+ case 'ax':
+ format = '####';
+ break;
+ default:
+ return false;
+ }
+ var flags = {format:format};
+ //FIXME? Why does isNumberFormat take an object for flags when its only parameter is either a string or an array inside the object?
+ if ((value.length == format.length)&&(dojo.validate.isNumberFormat(value, flags))){
+ return true;
+ }
+ return false;
+}
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/creditCard.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/datetime.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/datetime.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/datetime.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/datetime.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,172 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.datetime");
+dojo.require("dojo.validate.common");
+
+/**
+ Validates a time value in any International format.
+ The value can be validated against one format or one of multiple formats.
+
+ Format
+ h 12 hour, no zero padding.
+ hh 12 hour, has leading zero.
+ H 24 hour, no zero padding.
+ HH 24 hour, has leading zero.
+ m minutes, no zero padding.
+ mm minutes, has leading zero.
+ s seconds, no zero padding.
+ ss seconds, has leading zero.
+ All other characters must appear literally in the expression.
+
+ Example
+ "h:m:s t" -> 2:5:33 PM
+ "HH:mm:ss" -> 14:05:33
+
+ @param value A string.
+ @param flags An object.
+ flags.format A string or an array of strings. Default is "h:mm:ss t".
+ flags.amSymbol The symbol used for AM. Default is "AM".
+ flags.pmSymbol The symbol used for PM. Default is "PM".
+ @return true or false
+*/
+dojo.validate.isValidTime = function(value, flags) {
+ dojo.deprecated("dojo.validate.datetime", "use dojo.date.parse instead", "0.5");
+ var re = new RegExp("^" + dojo.regexp.time(flags) + "$", "i");
+ return re.test(value);
+}
+
+/**
+ Validates 12-hour time format.
+ Zero-padding is not allowed for hours, required for minutes and seconds.
+ Seconds are optional.
+
+ @param value A string.
+ @return true or false
+*/
+dojo.validate.is12HourTime = function(value) {
+ dojo.deprecated("dojo.validate.datetime", "use dojo.date.parse instead", "0.5");
+ return dojo.validate.isValidTime(value, {format: ["h:mm:ss t", "h:mm t"]});
+}
+
+/**
+ Validates 24-hour military time format.
+ Zero-padding is required for hours, minutes, and seconds.
+ Seconds are optional.
+
+ @param value A string.
+ @return true or false
+*/
+dojo.validate.is24HourTime = function(value) {
+ dojo.deprecated("dojo.validate.datetime", "use dojo.date.parse instead", "0.5");
+ return dojo.validate.isValidTime(value, {format: ["HH:mm:ss", "HH:mm"]} );
+}
+
+/**
+ Returns true if the date conforms to the format given and is a valid date. Otherwise returns false.
+
+ @param dateValue A string for the date.
+ @param format A string, default is "MM/DD/YYYY".
+ @return true or false
+
+ Accepts any type of format, including ISO8601.
+ All characters in the format string are treated literally except the following tokens:
+
+ YYYY - matches a 4 digit year
+ M - matches a non zero-padded month
+ MM - matches a zero-padded month
+ D - matches a non zero-padded date
+ DD - matches a zero-padded date
+ DDD - matches an ordinal date, 001-365, and 366 on leapyear
+ ww - matches week of year, 01-53
+ d - matches day of week, 1-7
+
+ Examples: These are all today's date.
+
+ Date Format
+ 2005-W42-3 YYYY-Www-d
+ 2005-292 YYYY-DDD
+ 20051019 YYYYMMDD
+ 10/19/2005 M/D/YYYY
+ 19.10.2005 D.M.YYYY
+*/
+dojo.validate.isValidDate = function(dateValue, format) {
+ dojo.deprecated("dojo.validate.datetime", "use dojo.date.parse instead", "0.5");
+ // Default is the American format
+ if (typeof format == "object" && typeof format.format == "string"){ format = format.format; }
+ if (typeof format != "string") { format = "MM/DD/YYYY"; }
+
+ // Create a literal regular expression based on format
+ var reLiteral = format.replace(/([$^.*+?=!:|\/\\\(\)\[\]\{\}])/g, "\\$1");
+
+ // Convert all the tokens to RE elements
+ reLiteral = reLiteral.replace( "YYYY", "([0-9]{4})" );
+ reLiteral = reLiteral.replace( "MM", "(0[1-9]|10|11|12)" );
+ reLiteral = reLiteral.replace( "M", "([1-9]|10|11|12)" );
+ reLiteral = reLiteral.replace( "DDD", "(00[1-9]|0[1-9][0-9]|[12][0-9][0-9]|3[0-5][0-9]|36[0-6])" );
+ reLiteral = reLiteral.replace( "DD", "(0[1-9]|[12][0-9]|30|31)" );
+ reLiteral = reLiteral.replace( "D", "([1-9]|[12][0-9]|30|31)" );
+ reLiteral = reLiteral.replace( "ww", "(0[1-9]|[1-4][0-9]|5[0-3])" );
+ reLiteral = reLiteral.replace( "d", "([1-7])" );
+
+ // Anchor pattern to begining and end of string
+ reLiteral = "^" + reLiteral + "$";
+
+ // Dynamic RE that parses the original format given
+ var re = new RegExp(reLiteral);
+
+ // Test if date is in a valid format
+ if (!re.test(dateValue)) return false;
+
+ // Parse date to get elements and check if date is valid
+ // Assume valid values for date elements not given.
+ var year = 0, month = 1, date = 1, dayofyear = 1, week = 1, day = 1;
+
+ // Capture tokens
+ var tokens = format.match( /(YYYY|MM|M|DDD|DD|D|ww|d)/g );
+
+ // Capture date values
+ var values = re.exec(dateValue);
+
+ // Match up tokens with date values
+ for (var i = 0; i < tokens.length; i++) {
+ switch (tokens[i]) {
+ case "YYYY":
+ year = Number(values[i+1]); break;
+ case "M":
+ case "MM":
+ month = Number(values[i+1]); break;
+ case "D":
+ case "DD":
+ date = Number(values[i+1]); break;
+ case "DDD":
+ dayofyear = Number(values[i+1]); break;
+ case "ww":
+ week = Number(values[i+1]); break;
+ case "d":
+ day = Number(values[i+1]); break;
+ }
+ }
+
+ // Leap years are divisible by 4, but not by 100, unless by 400
+ var leapyear = (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0));
+
+ // 31st of a month with 30 days
+ if (date == 31 && (month == 4 || month == 6 || month == 9 || month == 11)) return false;
+
+ // February 30th or 31st
+ if (date >= 30 && month == 2) return false;
+
+ // February 29th outside a leap year
+ if (date == 29 && month == 2 && !leapyear) return false;
+ if (dayofyear == 366 && !leapyear) return false;
+
+ return true;
+}
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/datetime.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/de.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/de.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/de.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/de.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,26 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.de");
+dojo.require("dojo.validate.common");
+
+dojo.validate.isGermanCurrency = function(/*String*/value) {
+ //summary: checks to see if 'value' is a valid representation of German currency (Euros)
+ var flags = {
+ symbol: "\u20AC",
+ placement: "after",
+ signPlacement: "begin", //TODO: this is really locale-dependent. Will get fixed in v0.5 currency rewrite.
+ decimal: ",",
+ separator: "."
+ };
+ return dojo.validate.isCurrency(value, flags); // Boolean
+}
+
+
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/de.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/jp.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/jp.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/jp.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/jp.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,23 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.jp");
+dojo.require("dojo.validate.common");
+
+dojo.validate.isJapaneseCurrency = function(/*String*/value) {
+ //summary: checks to see if 'value' is a valid representation of Japanese currency
+ var flags = {
+ symbol: "\u00a5",
+ fractional: false
+ };
+ return dojo.validate.isCurrency(value, flags); // Boolean
+}
+
+
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/jp.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/us.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/us.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/us.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/us.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,84 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.us");
+dojo.require("dojo.validate.common");
+
+dojo.validate.us.isCurrency = function(/*String*/value, /*Object?*/flags){
+ // summary: Validates U.S. currency
+ // value: the representation to check
+ // flags: flags in validate.isCurrency can be applied.
+ return dojo.validate.isCurrency(value, flags); // Boolean
+}
+
+
+dojo.validate.us.isState = function(/*String*/value, /*Object?*/flags){
+ // summary: Validates US state and territory abbreviations.
+ //
+ // value: A two character string
+ // flags: An object
+ // flags.allowTerritories Allow Guam, Puerto Rico, etc. Default is true.
+ // flags.allowMilitary Allow military 'states', e.g. Armed Forces Europe (AE). Default is true.
+
+ var re = new RegExp("^" + dojo.regexp.us.state(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.us.isPhoneNumber = function(/*String*/value){
+ // summary: Validates 10 US digit phone number for several common formats
+ // value: The telephone number string
+
+ var flags = {
+ format: [
+ "###-###-####",
+ "(###) ###-####",
+ "(###) ### ####",
+ "###.###.####",
+ "###/###-####",
+ "### ### ####",
+ "###-###-#### x#???",
+ "(###) ###-#### x#???",
+ "(###) ### #### x#???",
+ "###.###.#### x#???",
+ "###/###-#### x#???",
+ "### ### #### x#???",
+ "##########"
+ ]
+ };
+
+ return dojo.validate.isNumberFormat(value, flags); // Boolean
+}
+
+dojo.validate.us.isSocialSecurityNumber = function(/*String*/value){
+// summary: Validates social security number
+ var flags = {
+ format: [
+ "###-##-####",
+ "### ## ####",
+ "#########"
+ ]
+ };
+
+ return dojo.validate.isNumberFormat(value, flags); // Boolean
+}
+
+dojo.validate.us.isZipCode = function(/*String*/value){
+// summary: Validates U.S. zip-code
+ var flags = {
+ format: [
+ "#####-####",
+ "##### ####",
+ "#########",
+ "#####"
+ ]
+ };
+
+ return dojo.validate.isNumberFormat(value, flags); // Boolean
+}
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/us.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/web.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/web.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/web.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/web.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,95 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.validate.web");
+dojo.require("dojo.validate.common");
+
+dojo.validate.isIpAddress = function(/*String*/value, /*Object?*/flags) {
+ // summary: Validates an IP address
+ //
+ // description:
+ // Supports 5 formats for IPv4: dotted decimal, dotted hex, dotted octal, decimal and hexadecimal.
+ // Supports 2 formats for Ipv6.
+ //
+ // value A string.
+ // flags An object. All flags are boolean with default = true.
+ // flags.allowDottedDecimal Example, 207.142.131.235. No zero padding.
+ // flags.allowDottedHex Example, 0x18.0x11.0x9b.0x28. Case insensitive. Zero padding allowed.
+ // flags.allowDottedOctal Example, 0030.0021.0233.0050. Zero padding allowed.
+ // flags.allowDecimal Example, 3482223595. A decimal number between 0-4294967295.
+ // flags.allowHex Example, 0xCF8E83EB. Hexadecimal number between 0x0-0xFFFFFFFF.
+ // Case insensitive. Zero padding allowed.
+ // flags.allowIPv6 IPv6 address written as eight groups of four hexadecimal digits.
+ // flags.allowHybrid IPv6 address written as six groups of four hexadecimal digits
+ // followed by the usual 4 dotted decimal digit notation of IPv4. x:x:x:x:x:x:d.d.d.d
+
+ var re = new RegExp("^" + dojo.regexp.ipAddress(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+
+dojo.validate.isUrl = function(/*String*/value, /*Object?*/flags) {
+ // summary: Checks if a string could be a valid URL
+ // value: A string
+ // flags: An object
+ // flags.scheme Can be true, false, or [true, false].
+ // This means: required, not allowed, or either.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ var re = new RegExp("^" + dojo.regexp.url(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isEmailAddress = function(/*String*/value, /*Object?*/flags) {
+ // summary: Checks if a string could be a valid email address
+ //
+ // value: A string
+ // flags: An object
+ // flags.allowCruft Allow address like <ma...@yahoo.com>. Default is false.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ var re = new RegExp("^" + dojo.regexp.emailAddress(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.isEmailAddressList = function(/*String*/value, /*Object?*/flags) {
+ // summary: Checks if a string could be a valid email address list.
+ //
+ // value A string.
+ // flags An object.
+ // flags.listSeparator The character used to separate email addresses. Default is ";", ",", "\n" or " ".
+ // flags in regexp.emailAddress can be applied.
+ // flags in regexp.host can be applied.
+ // flags in regexp.ipAddress can be applied.
+ // flags in regexp.tld can be applied.
+
+ var re = new RegExp("^" + dojo.regexp.emailAddressList(flags) + "$", "i");
+ return re.test(value); // Boolean
+}
+
+dojo.validate.getEmailAddressList = function(/*String*/value, /*Object?*/flags) {
+ // summary: Check if value is an email address list. If an empty list
+ // is returned, the value didn't pass the test or it was empty.
+ //
+ // value: A string
+ // flags: An object (same as dojo.validate.isEmailAddressList)
+
+ if(!flags) { flags = {}; }
+ if(!flags.listSeparator) { flags.listSeparator = "\\s;,"; }
+
+ if ( dojo.validate.isEmailAddressList(value, flags) ) {
+ return value.split(new RegExp("\\s*[" + flags.listSeparator + "]\\s*")); // Array
+ }
+ return []; // Array
+}
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/validate/web.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AccordionContainer.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AccordionContainer.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AccordionContainer.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AccordionContainer.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,279 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.widget.AccordionContainer");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.html.*");
+dojo.require("dojo.lfx.html");
+dojo.require("dojo.html.selection");
+dojo.require("dojo.widget.html.layout");
+dojo.require("dojo.widget.PageContainer");
+
+
+/**
+ *summary
+ * Holds a set of panes where every pane's title is visible, but only one pane's content is visible at a time,
+ * and switching between panes is visualized by sliding the other panes up/down.
+ *
+ * description
+ * Front view (3 panes, pane #2 open)
+ * ------------------------
+ * |:::Pane#1 title::: |
+ * |:::Pane#2 title::: |
+ * | |
+ * | pane#2 contents |
+ * | |
+ * |:::Pane#3 title::: |
+ * ------------------------
+ *
+ * Side view (showing implementation):
+ *
+ * viewport pane#3 pane#2 pane#1
+ * =
+ * | =
+ * | = |
+ * front | | |
+ * | | =
+ * | =
+ * | =
+ * = |
+ * |
+ * =
+ *
+ * Panes are stacked by z-index like a stack of cards, so they can be slid correctly.
+ * The panes on the bottom extend past the bottom of the viewport (but are hidden).
+ *
+ * usage
+ * <div dojoType="AccordionContainer">
+ * <div dojoType="ContentPane" label="pane 1">...</div>
+ * ...
+ * </div>
+ *
+ * TODO:
+ * * this widget should extend PageContainer
+ * * call child.onShow(), child.onHide() so you can attach to those methods if you want
+ */
+ dojo.widget.defineWidget(
+ "dojo.widget.AccordionContainer",
+ dojo.widget.HtmlWidget,
+ {
+ isContainer: true,
+
+ // String
+ // CSS class name for dom node w/the title
+ labelNodeClass: "label",
+
+ // String
+ // CSS class name for dom node holding the content
+ containerNodeClass: "accBody",
+
+ // Integer
+ // Amount of time (in ms) it takes to slide panes
+ duration: 250,
+
+ fillInTemplate: function(){
+ with(this.domNode.style){
+ // position must be either relative or absolute
+ if(position!="absolute"){
+ position="relative";
+ }
+ overflow="hidden";
+ }
+ },
+
+ addChild: function(/*Widget*/ widget){
+ var child = this._addChild(widget);
+ this._setSizes();
+ return child; // Widget
+ },
+
+ _addChild: function(/*Widget*/ widget){
+ // summary
+ // Internal call to add child, used during postCreate() and by the real addChild() call
+ if(widget.open){
+ dojo.deprecated("open parameter deprecated, use 'selected=true' instead will be removed in ", "0.5");
+ dojo.debug(widget.widgetId + ": open == " + widget.open);
+ widget.selected=true;
+ }
+ if (widget.widgetType != "AccordionPane") {
+ var wrapper=dojo.widget.createWidget("AccordionPane",{label: widget.label, selected: widget.selected, labelNodeClass: this.labelNodeClass, containerNodeClass: this.containerNodeClass, allowCollapse: this.allowCollapse });
+ wrapper.addChild(widget);
+ this.addWidgetAsDirectChild(wrapper);
+ this.registerChild(wrapper, this.children.length);
+ return wrapper; // Widget
+ } else {
+ dojo.html.addClass(widget.containerNode, this.containerNodeClass);
+ dojo.html.addClass(widget.labelNode, this.labelNodeClass);
+ this.addWidgetAsDirectChild(widget);
+ this.registerChild(widget, this.children.length);
+ return widget; // Widget
+ }
+ },
+
+ postCreate: function() {
+ var tmpChildren = this.children;
+ this.children=[];
+ dojo.html.removeChildren(this.domNode);
+ dojo.lang.forEach(tmpChildren, dojo.lang.hitch(this,"_addChild"));
+ this._setSizes();
+ },
+
+ removeChild: function(/*Widget*/ widget) {
+ dojo.widget.AccordionContainer.superclass.removeChild.call(this, widget);
+ this._setSizes();
+ },
+
+ onResized: function(){
+ this._setSizes();
+ },
+
+ _setSizes: function() {
+ // summary
+ // Set panes' size/position based on my size, and the current open node.
+
+ // get cumulative height of all the title bars, and figure out which pane is open
+ var totalCollapsedHeight = 0;
+ var openIdx = 0;
+ dojo.lang.forEach(this.children, function(child, idx){
+ totalCollapsedHeight += child.getLabelHeight();
+ if(child.selected){ openIdx=idx; }
+ });
+
+ // size and position each pane
+ var mySize=dojo.html.getContentBox(this.domNode);
+ var y = 0;
+ dojo.lang.forEach(this.children, function(child, idx){
+ var childCollapsedHeight = child.getLabelHeight();
+ child.resizeTo(mySize.width, mySize.height-totalCollapsedHeight+childCollapsedHeight);
+ child.domNode.style.zIndex=idx+1;
+ child.domNode.style.position="absolute";
+ child.domNode.style.top = y+"px";
+ y += (idx==openIdx) ? dojo.html.getBorderBox(child.domNode).height : childCollapsedHeight;
+ });
+ },
+
+ selectChild: function(/*Widget*/ page){
+ // summary
+ // close the current page and select a new one
+ dojo.lang.forEach(this.children, function(child){child.setSelected(child==page);});
+
+ // slide each pane that needs to be moved
+ var y = 0;
+ var anims = [];
+ dojo.lang.forEach(this.children, function(child, idx){
+ if(child.domNode.style.top != (y+"px")){
+ anims.push(dojo.lfx.html.slideTo(child.domNode, {top: y, left: 0}, this.duration));
+ }
+ y += child.selected ? dojo.html.getBorderBox(child.domNode).height : child.getLabelHeight();
+ });
+ dojo.lfx.combine(anims).play();
+ }
+ }
+);
+
+/**
+ * summary
+ * AccordionPane is a box with a title that contains another widget (often a ContentPane).
+ * It's a widget used internally by AccordionContainer.
+ */
+dojo.widget.defineWidget(
+ "dojo.widget.AccordionPane",
+ dojo.widget.HtmlWidget,
+{
+ // parameters
+
+ // String
+ // label to print on top of AccordionPane
+ label: "",
+
+ // String
+ // CSS class name for the AccordionPane's dom node
+ "class": "dojoAccordionPane",
+
+ // String
+ // CSS class name for the AccordionPane's label node
+ labelNodeClass: "label",
+
+ // String
+ // CSS class name for the AccordionPane's container node
+ containerNodeClass: "accBody",
+
+ // Boolean
+ // if true, this is the open pane
+ selected: false,
+
+ templatePath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.html"),
+ templateCssPath: dojo.uri.dojoUri("src/widget/templates/AccordionPane.css"),
+
+ isContainer: true,
+
+ fillInTemplate: function() {
+ dojo.html.addClass(this.domNode, this["class"]);
+ dojo.widget.AccordionPane.superclass.fillInTemplate.call(this);
+ dojo.html.disableSelection(this.labelNode);
+ this.setSelected(this.selected);
+ },
+
+ setLabel: function(/*String*/ label) {
+ // summary: set the title of the node
+ this.labelNode.innerHTML=label;
+ },
+
+ resizeTo: function(width, height){
+ dojo.html.setMarginBox(this.domNode, {width: width, height: height});
+ var children = [
+ {domNode: this.labelNode, layoutAlign: "top"},
+ {domNode: this.containerNode, layoutAlign: "client"}
+ ];
+ dojo.widget.html.layout(this.domNode, children);
+ var childSize = dojo.html.getContentBox(this.containerNode);
+ this.children[0].resizeTo(childSize.width, childSize.height);
+ },
+
+ getLabelHeight: function() {
+ // summary: returns the height of the title dom node
+ return dojo.html.getMarginBox(this.labelNode).height; // Integer
+ },
+
+ onLabelClick: function() {
+ // summary: callback when someone clicks my label
+ this.parent.selectChild(this);
+ },
+
+ setSelected: function(/*Boolean*/ isSelected){
+ this.selected=isSelected;
+ (isSelected ? dojo.html.addClass : dojo.html.removeClass)(this.domNode, this["class"]+"-selected");
+
+ // make sure child is showing (lazy load), and also that onShow()/onHide() is called
+ var child = this.children[0];
+ if(child){
+ if(isSelected){
+ if(!child.isShowing()){
+ child.show();
+ }else{
+ child.onShow();
+ }
+ }else{
+ child.onHide();
+ }
+ }
+ }
+});
+
+// These arguments can be specified for the children of an AccordionContainer
+// Since any widget can be specified as a child, mix them
+// into the base widget class. (This is a hack, but it's effective.)
+dojo.lang.extend(dojo.widget.Widget, {
+ // String
+ // is this the selected child?
+ // DEPRECATED: will be removed in 0.5. Used "selected" attribute instead.
+ open: false
+});
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AccordionContainer.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AnimatedPng.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AnimatedPng.js?view=auto&rev=474551
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AnimatedPng.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AnimatedPng.js Mon Nov 13 14:54:45 2006
@@ -0,0 +1,98 @@
+/*
+ Copyright (c) 2004-2006, The Dojo Foundation
+ All Rights Reserved.
+
+ Licensed under the Academic Free License version 2.1 or above OR the
+ modified BSD license. For more information on Dojo licensing, see:
+
+ http://dojotoolkit.org/community/licensing.shtml
+*/
+
+dojo.provide("dojo.widget.AnimatedPng");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+
+// summary
+// PNGs have great tranparency, but lack animation.
+// This widget lets you point an img tag at an animated gif for graceful degrading,
+// while letting you specify a png containing a grid of cells to animate between.
+//
+// usage
+// <img dojoType="AnimatedPng"
+// src="images/animatedpng_static.gif" (for degradation; in case javascript is disabled)
+// aniSrc="images/animatedpng_frames.gif"
+// width="20"
+// height="20"
+// interval="50"
+// />
+//
+// var params = {src: "images/animatedpng_static.gif", aniSrc: "images/animatedpng_frames.gif", width: 20, height: 20, interval: 50};
+// var widget = dojo.widget.createWidget("AnimatedPng", params, document.getElementById("pngContainer"));
+//
+dojo.widget.defineWidget(
+ "dojo.widget.AnimatedPng",
+ dojo.widget.HtmlWidget,
+ {
+ isContainer: false,
+
+ // Integer
+ // width (of each frame) in pixels
+ width: 0,
+
+ // Integer
+ // height (of each frame) in pixels
+ height: 0,
+
+ // String
+ // pathname to png file containing frames to be animated (ie, displayed sequentially)
+ aniSrc: '',
+
+ // Integer
+ // time to display each frame
+ interval: 100,
+
+ _blankSrc: dojo.uri.dojoUri("src/widget/templates/images/blank.gif"),
+
+ templateString: '<img class="dojoAnimatedPng" />',
+
+ postCreate: function(){
+ this.cellWidth = this.width;
+ this.cellHeight = this.height;
+
+ var img = new Image();
+ var self = this;
+
+ img.onload = function(){ self._initAni(img.width, img.height); };
+ img.src = this.aniSrc;
+ },
+
+ _initAni: function(w, h){
+ this.domNode.src = this._blankSrc;
+ this.domNode.width = this.cellWidth;
+ this.domNode.height = this.cellHeight;
+ this.domNode.style.backgroundImage = 'url('+this.aniSrc+')';
+ this.domNode.style.backgroundRepeat = 'no-repeat';
+
+ this.aniCols = Math.floor(w/this.cellWidth);
+ this.aniRows = Math.floor(h/this.cellHeight);
+ this.aniCells = this.aniCols * this.aniRows;
+ this.aniFrame = 0;
+
+ window.setInterval(dojo.lang.hitch(this, '_tick'), this.interval);
+ },
+
+ _tick: function(){
+ this.aniFrame++;
+ if (this.aniFrame == this.aniCells) this.aniFrame = 0;
+
+ var col = this.aniFrame % this.aniCols;
+ var row = Math.floor(this.aniFrame / this.aniCols);
+
+ var bx = -1 * col * this.cellWidth;
+ var by = -1 * row * this.cellHeight;
+
+ this.domNode.style.backgroundPosition = bx+'px '+by+'px';
+ }
+ }
+);
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/src/widget/AnimatedPng.js
------------------------------------------------------------------------------
svn:eol-style = native