svn commit: r537473 - in /struts/struts2/trunk/core/src: main/resources/template/simple/ test/java/org/apache/struts2/views/jsp/ui/ test/resources/org/apache/struts2/views/jsp/ui/

[musachy]

Author: musachy
Date: Sat May 12 09:00:30 2007
New Revision: 537473

URL: http://svn.apache.org/viewvc?view=rev&rev=537473
Log:
WW-1914  attribute tabindex does not get rendered for submit tag

Modified:
    struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
    
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl?view=diff&rev=537473&r1=537472&r2=537473
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/submit.ftl Sat 
May 12 09:00:30 2007
@@ -18,6 +18,9 @@
 <#if parameters.cssStyle?exists>
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
+<#if parameters.tabindex?exists>
+ tabindex="${parameters.tabindex?html}"<#rt/>
+</#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
 ><#if parameters.body?length gt 0><@s.property 
 >value="parameters.body"/><#elseif parameters.label?exists><@s.property 
 >value="parameters.label"/><#rt/></#if></button>
@@ -54,6 +57,9 @@
 </#if>
 <#if parameters.title?exists>
  title="${parameters.title?html}"<#rt/>
+</#if>
+<#if parameters.tabindex?exists>
+ tabindex="${parameters.tabindex?html}"<#rt/>
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java?view=diff&rev=537473&r1=537472&r2=537473
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
 Sat May 12 09:00:30 2007
@@ -60,7 +60,8 @@
         tag.setName("myname");
         tag.setValue("%{foo}");
         tag.setDisabled("true");
-
+        tag.setTabindex("1");
+        
         tag.doStartTag();
         tag.doEndTag();
 
@@ -77,7 +78,8 @@
         tag.setName("myname");
         tag.setValue("%{foo}");
         tag.setDisabled("true");
-
+        tag.setTabindex("1");
+        
         tag.doStartTag();
         tag.doEndTag();
 

Modified: 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt?view=diff&rev=537473&r1=537472&r2=537473
==============================================================================
--- 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
 (original)
+++ 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
 Sat May 12 09:00:30 2007
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="left"><input type="submit" id="myname" 
name="myname" value="bar" disabled="disabled"/></div></td>
+    <td colspan="2"><div align="left"><input type="submit" id="myname" 
name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
 </tr>

Modified: 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt?view=diff&rev=537473&r1=537472&r2=537473
==============================================================================
--- 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
 (original)
+++ 
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-3.txt
 Sat May 12 09:00:30 2007
@@ -1,3 +1,3 @@
 <tr>
-    <td colspan="2"><div align="right"><button type="submit" id="myname" 
name="myname" value="bar" disabled="disabled">bar</button></div></td>
+    <td colspan="2"><div align="right"><button type="submit" id="myname" 
name="myname" value="bar" disabled="disabled" 
tabindex="1">bar</button></div></td>
 </tr>