You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by pb...@apache.org on 2007/06/27 04:13:20 UTC
svn commit: r551010 -
/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Author: pbenedict
Date: Tue Jun 26 19:13:19 2007
New Revision: 551010
URL: http://svn.apache.org/viewvc?view=rev&rev=551010
Log:
STR-1709: Add null check on javascript field focus
Modified:
struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
Modified: struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
URL: http://svn.apache.org/viewvc/struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java?view=diff&rev=551010&r1=551009&r2=551010
==============================================================================
--- struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java (original)
+++ struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java Tue Jun 26 19:13:19 2007
@@ -721,7 +721,8 @@
results.append(lineEnd);
results.append(lineEnd);
- results.append(" if (focusControl.type != \"hidden\" && ");
+ results.append(" if (focusControl != null && ");
+ results.append("focusControl.type != \"hidden\" && ");
results.append("!focusControl.disabled && ");
results.append("focusControl.style.display != \"none\") {");
results.append(lineEnd);