dgraham 2003/01/20 19:19:11 Modified: conf/share validator-rules.xml Log: Fixed javascript bug when selectedIndex == -1. PR# 16259 Revision Changes Path 1.23 +31 -21 jakarta-struts/conf/share/validator-rules.xml Index: validator-rules.xml =================================================================== RCS file: /home/cvs/jakarta-struts/conf/share/validator-rules.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- validator-rules.xml 20 Jan 2003 05:12:32 -0000 1.22 +++ validator-rules.xml 21 Jan 2003 03:19:11 -0000 1.23 @@ -69,11 +69,13 @@ field.type == 'radio' || field.type == 'password') { - var value; + var value = ''; // get field's value if (field.type == "select-one") { var si = field.selectedIndex; - value = field.options[si].value; + if (si >= 0) { + value = field.options[si].value; + } } else { value = field.value; } @@ -272,11 +274,13 @@ field.type == 'select-one' || field.type == 'radio') { - var value; + var value = ''; // get field's value if (field.type == "select-one") { var si = field.selectedIndex; - value = field.options[si].value; + if (si >= 0) { + value = field.options[si].value; + } } else { value = field.value; } @@ -333,11 +337,13 @@ field.type == 'select-one' || field.type == 'radio') { - var value; + var value = ''; // get field's value if (field.type == "select-one") { var si = field.selectedIndex; - value = field.options[si].value; + if (si >= 0) { + value = field.options[si].value; + } } else { value = field.value; } @@ -393,28 +399,30 @@ field.type == 'select-one' || field.type == 'radio') { - var value; + var value = ''; // get field's value if (field.type == "select-one") { var si = field.selectedIndex; - value = field.options[si].value; + if (si >= 0) { + value = field.options[si].value; + } } else { value = field.value; } if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - } else { - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - bValid = false; - } + if (!isAllDigits(value)) { + bValid = false; + } else { + var iValue = parseInt(value); + if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) { + if (i == 0) { + focusField = field; + } + fields[i++] = oInteger[x][1]; + bValid = false; + } } } } @@ -486,11 +494,13 @@ field.type == 'select-one' || field.type == 'radio') { - var value; + var value = ''; // get field's value if (field.type == "select-one") { var si = field.selectedIndex; - value = field.options[si].value; + if (si >= 0) { + value = field.options[si].value; + } } else { value = field.value; }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>