Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 56504 invoked from network); 5 Dec 2007 05:46:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Dec 2007 05:46:50 -0000 Received: (qmail 12031 invoked by uid 500); 5 Dec 2007 05:46:37 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 11991 invoked by uid 500); 5 Dec 2007 05:46:36 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 11982 invoked by uid 99); 5 Dec 2007 05:46:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2007 21:46:36 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 05:46:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9C7951A983A; Tue, 4 Dec 2007 21:46:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r601214 - /struts/struts1/branches/STRUTS_1_3_BRANCH/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java Date: Wed, 05 Dec 2007 05:46:25 -0000 To: commits@struts.apache.org From: pbenedict@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071205054625.9C7951A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pbenedict Date: Tue Dec 4 21:46:24 2007 New Revision: 601214 URL: http://svn.apache.org/viewvc?rev=601214&view=rev Log: STR-3112: Correct javascript to focus on indexed field 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?rev=601214&r1=601213&r2=601214&view=diff ============================================================================== --- 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 Dec 4 21:46:24 2007 @@ -706,14 +706,22 @@ results.append(lineEnd); } + // Construct the index if needed and insert into focus statement + String index = ""; + if (this.focusIndex != null) { + StringBuffer sb = new StringBuffer("["); + sb.append(this.focusIndex); + sb.append("]"); + index = sb.toString(); + } + // Construct the control name that will receive focus. - // This does not include any index. StringBuffer focusControl = new StringBuffer("document.forms[\""); - focusControl.append(beanName); focusControl.append("\"].elements[\""); focusControl.append(this.focus); focusControl.append("\"]"); + focusControl.append(index); results.append(" var focusControl = "); results.append(focusControl.toString()); @@ -727,19 +735,7 @@ results.append("focusControl.style.display != \"none\") {"); results.append(lineEnd); - // Construct the index if needed and insert into focus statement - String index = ""; - - if (this.focusIndex != null) { - StringBuffer sb = new StringBuffer("["); - - sb.append(this.focusIndex); - sb.append("]"); - index = sb.toString(); - } - results.append(" focusControl"); - results.append(index); results.append(".focus();"); results.append(lineEnd);