dgraham 2002/11/16 16:56:19
Modified: src/share/org/apache/struts/taglib/html FormTag.java
Log:
Fixed focus js for element arrays.
Bug #13854
Revision Changes Path
1.35 +25 -8
jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java
Index: FormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/FormTag.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FormTag.java 16 Nov 2002 06:05:21 -0000 1.34
+++ FormTag.java 17 Nov 2002 00:56:19 -0000 1.35
@@ -627,7 +627,7 @@
results.append("\r\n");
results.append(this.getJsStartElement());
results.append(" <!--\r\n");
- results.append(" if (document.forms[\"");
+ results.append(" if (document.forms[\"");
results.append(beanName);
results.append("\"].elements[\"");
results.append(tempFocus);
@@ -636,15 +636,32 @@
results.append(refocus.toString());
}
results.append(".type != \"hidden\") \r\n");
- results.append(" document.forms[\"");
+
+
+ results.append(" var focusControl = document.forms[\"");
results.append(beanName);
results.append("\"].elements[\"");
results.append(tempFocus);
- results.append("\"]");
+ results.append("\"];");
if (refocus.length() > 1) {
results.append(refocus.toString());
}
- results.append(".focus()\r\n");
+ results.append("\r\n");
+
+ results.append(" if (focusControl.name == null) {\r\n");
+ results.append(" focusControl = focusControl[0];\r\n");
+ results.append(" }\r\n");
+ results.append(" focusControl.focus();\r\n");
+// results.append(" document.forms[\"");
+// results.append(beanName);
+// results.append("\"].elements[\"");
+// results.append(tempFocus);
+// results.append("\"]");
+// if (refocus.length() > 1) {
+// results.append(refocus.toString());
+// }
+// results.append(".focus();\r\n");
+
results.append(" // -->\r\n");
results.append("</script>\r\n");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
