Repository: struts Updated Branches: refs/heads/master ad367777c -> 533b236fd
WW-4739 <s:reset> tag does not properly interpret the attribute tabindex Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/533b236f Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/533b236f Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/533b236f Branch: refs/heads/master Commit: 533b236fdbfb0df3a3b1ea459e88e69f1c3b3ec7 Parents: ad36777 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Thu Feb 2 21:56:53 2017 +0200 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Thu Feb 2 21:56:53 2017 +0200 ---------------------------------------------------------------------- core/src/main/resources/template/simple/reset.ftl | 6 ++++++ .../test/java/org/apache/struts2/views/jsp/ui/ResetTest.java | 2 ++ .../test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +- .../test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/533b236f/core/src/main/resources/template/simple/reset.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/reset.ftl b/core/src/main/resources/template/simple/reset.ftl index 7e7481f..67d6505 100644 --- a/core/src/main/resources/template/simple/reset.ftl +++ b/core/src/main/resources/template/simple/reset.ftl @@ -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" /> http://git-wip-us.apache.org/repos/asf/struts/blob/533b236f/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java index 913ead8..6db4adf 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java @@ -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(); http://git-wip-us.apache.org/repos/asf/struts/blob/533b236f/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt index 699faf7..4d6b7fc 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/533b236f/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt index a9f63c0..f956573 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt @@ -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>
