You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mr...@apache.org on 2005/08/14 19:45:37 UTC
svn commit: r232626 -
/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/
Author: mrdon
Date: Sun Aug 14 10:45:34 2005
New Revision: 232626
URL: http://svn.apache.org/viewcvs?rev=232626&view=rev
Log:
Changing the strategy for locating form name/id, now use a common utility function which works in both IE and Firefox
PR: 35127 and 32760
Modified:
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateByte.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateDate.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateEmail.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloat.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloatRange.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateIntRange.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateInteger.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMask.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMaxLength.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMinLength.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateRequired.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateShort.js
jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateUtilities.js
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateByte.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateByte.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateByte.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateByte.js Sun Aug 14 10:45:34 2005
@@ -11,11 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oByte = eval('new ' + formName.value + '_ByteValidations()');
+
+ oByte = eval('new ' + retrieveFormName(form) + '_ByteValidations()');
for (x in oByte) {
var field = form[oByte[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oCreditCard = eval('new ' + formName.value + '_creditCard()');
+ oCreditCard = eval('new ' + retrieveFormName(form) + '_creditCard()');
for (x in oCreditCard) {
if ((form[oCreditCard[x][0]].type == 'text' ||
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateDate.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateDate.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateDate.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateDate.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oDate = eval('new ' + formName.value + '_DateValidations()');
+ oDate = eval('new ' + retrieveFormName(form) + '_DateValidations()');
for (x in oDate) {
var field = form[oDate[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateEmail.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateEmail.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateEmail.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateEmail.js Sun Aug 14 10:45:34 2005
@@ -11,13 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
-
- oEmail = eval('new ' + formName.value + '_email()');
+ oEmail = eval('new ' + retrieveFormName(form) + '_email()');
for (x in oEmail) {
var field = form[oEmail[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloat.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloat.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloat.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloat.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oFloat = eval('new ' + formName.value + '_FloatValidations()');
+ oFloat = eval('new ' + retrieveFormName(form) + '_FloatValidations()');
for (x in oFloat) {
var field = form[oFloat[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloatRange.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloatRange.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloatRange.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateFloatRange.js Sun Aug 14 10:45:34 2005
@@ -11,11 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oRange = eval('new ' + formName.value + '_floatRange()');
+
+ oRange = eval('new ' + retrieveFormName(form) + '_floatRange()');
for (x in oRange) {
var field = form[oRange[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateIntRange.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateIntRange.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateIntRange.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateIntRange.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oRange = eval('new ' + formName.value + '_intRange()');
+ oRange = eval('new ' + retrieveFormName(form) + '_intRange()');
for (x in oRange) {
var field = form[oRange[x][0]];
if (field.disabled == false) {
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateInteger.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateInteger.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateInteger.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateInteger.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oInteger = eval('new ' + formName.value + '_IntegerValidations()');
+ oInteger = eval('new ' + retrieveFormName(form) + '_IntegerValidations()');
for (x in oInteger) {
var field = form[oInteger[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMask.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMask.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMask.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMask.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oMasked = eval('new ' + formName.value + '_mask()');
+ oMasked = eval('new ' + retrieveFormName(form) + '_mask()');
for (x in oMasked) {
var field = form[oMasked[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMaxLength.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMaxLength.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMaxLength.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMaxLength.js Sun Aug 14 10:45:34 2005
@@ -14,12 +14,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oMaxLength = eval('new ' + formName.value + '_maxlength()');
+ oMaxLength = eval('new ' + retrieveFormName(form) + '_maxlength()');
for (x in oMaxLength) {
var field = form[oMaxLength[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMinLength.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMinLength.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMinLength.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateMinLength.js Sun Aug 14 10:45:34 2005
@@ -14,13 +14,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
-
- oMinLength = eval('new ' + formName.value + '_minlength()');
+ oMinLength = eval('new ' + retrieveFormName(form) + '_minlength()');
for (x in oMinLength) {
var field = form[oMinLength[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateRequired.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateRequired.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateRequired.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateRequired.js Sun Aug 14 10:45:34 2005
@@ -12,12 +12,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oRequired = eval('new ' + formName.value + '_required()');
+ oRequired = eval('new ' + retrieveFormName(form) + '_required()');
for (x in oRequired) {
var field = form[oRequired[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateShort.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateShort.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateShort.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateShort.js Sun Aug 14 10:45:34 2005
@@ -11,12 +11,8 @@
var focusField = null;
var i = 0;
var fields = new Array();
- var formName = form.getAttributeNode("name");
- if (formName == null) {
- formName = form.getAttributeNode("id");
- }
- oShort = eval('new ' + formName.value + '_ShortValidations()');
+ oShort = eval('new ' + retrieveFormName(form) + '_ShortValidations()');
for (x in oShort) {
var field = form[oShort[x][0]];
Modified: jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateUtilities.js
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateUtilities.js?rev=232626&r1=232625&r2=232626&view=diff
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateUtilities.js (original)
+++ jakarta/commons/proper/validator/trunk/src/javascript/org/apache/commons/validator/javascript/validateUtilities.js Sun Aug 14 10:45:34 2005
@@ -3,4 +3,16 @@
/**
* This is a place holder for common utilities used across the javascript validation
*
- **/
\ No newline at end of file
+ **/
+
+ /**
+ * Retreive the name of the form
+ * @param form The form validation is taking place on.
+ */
+ function retrieveFormName(form) {
+ // if id is available, then use it (for xhtml)
+ // otherwise, use the value of the name attribute
+ var formName = form.id ? form.id :
+ form.getAttributeNode("name").value;
+ return formName;
+ }
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org