Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4739 <s:reset> tag does not properly interpret the attribute tabindex

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2017-02-02 21:56:53 +02:00
parent ad367777cb
commit 533b236fdb
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/simple/reset.ftl
+6
View File
@@ -37,6 +37,9 @@
<#if parameters.disabled!false>
disabled="disabled"<#rt/>
</#if>
<#if parameters.tabindex?has_content>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl"/>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
@@ -69,6 +72,9 @@
<#if parameters.disabled!false>
disabled="disabled"<#rt/>
</#if>
<#if parameters.tabindex?has_content>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" />
<#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" />
core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
+2
View File
@@ -59,6 +59,7 @@ public class ResetTest extends AbstractUITagTest {
tag.setLabel("mylabel");
tag.setName("myname");
tag.setValue("%{foo}");
tag.setTabindex("1");
tag.doStartTag();
tag.doEndTag();
@@ -75,6 +76,7 @@ public class ResetTest extends AbstractUITagTest {
tag.setType("button");
tag.setName("myname");
tag.setValue("%{foo}");
tag.setTabindex("1");
tag.doStartTag();
tag.doEndTag();
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar"/></div></td>
<td colspan="2"><div class="formButton"><input type="reset" name="myname" value="bar" tabindex="1"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar">bar</button></div></td>
<td colspan="2"><div class="formButton"><button type="reset" name="myname" value="bar" tabindex="1">bar</button></div></td>
</tr>