You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by am...@apache.org on 2016/05/04 20:01:40 UTC
[2/2] struts git commit: WW-4630 - generates a value attribute for type=image which violates W3C (cherry picked from commit c4d2b687be8bdb454a11c5376bb475a8fa7f9c67)
WW-4630 - <s:submit> generates a value attribute for type=image which violates W3C (cherry picked from commit c4d2b687be8bdb454a11c5376bb475a8fa7f9c67\u200b)
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/731fde54
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/731fde54
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/731fde54
Branch: refs/heads/support-2-3
Commit: 731fde544c00bcc3933a561848b81374939954aa
Parents: 76eb8f3
Author: Aleksandr Mashchenko <am...@apache.org>
Authored: Wed May 4 22:54:28 2016 +0300
Committer: Aleksandr Mashchenko <am...@apache.org>
Committed: Wed May 4 23:00:33 2016 +0300
----------------------------------------------------------------------
core/src/main/resources/template/simple/submit.ftl | 6 +++---
.../test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java | 2 +-
.../resources/org/apache/struts2/views/jsp/ui/Submit-1.txt | 2 +-
.../resources/org/apache/struts2/views/jsp/ui/Submit-2.txt | 2 +-
.../resources/org/apache/struts2/views/jsp/ui/Submit-5.txt | 2 +-
.../resources/org/apache/struts2/views/jsp/ui/Submit-6.txt | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/main/resources/template/simple/submit.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/submit.ftl b/core/src/main/resources/template/simple/submit.ftl
index 24db4a8..d77b5d0 100644
--- a/core/src/main/resources/template/simple/submit.ftl
+++ b/core/src/main/resources/template/simple/submit.ftl
@@ -61,6 +61,9 @@
</#if>
<#else>
<input type="submit"<#rt/>
+<#if parameters.nameValue?has_content>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
+</#if>
</#if>
<#if parameters.id?has_content>
id="${parameters.id?html}"<#rt/>
@@ -68,9 +71,6 @@
<#if parameters.name?has_content>
name="${parameters.name?html}"<#rt/>
</#if>
-<#if parameters.nameValue?has_content>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
-</#if>
<#if parameters.disabled!false>
disabled="disabled"<#rt/>
</#if>
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
index 41f0cc5..c32fb0b 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
@@ -237,7 +237,7 @@ public class SubmitTest extends AbstractUITagTest {
tag.doStartTag();
tag.doEndTag();
- assertEquals("<input type=\"submit\" id=\"myname\" name=\"myname\" value=\"Submit\"/>", writer.toString().trim());
+ assertEquals("<input type=\"submit\" value=\"Submit\" id=\"myname\" name=\"myname\"/>", writer.toString().trim());
}
/**
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
index 9057dd2..ac308d5 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="left"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
+ <td colspan="2"><div align="left"><input type="submit" value="bar" id="myname" name="myname" disabled="disabled" tabindex="1"/></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
index 42e7f1d..ce00b61 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
+ <td colspan="2"><div align="right"><input type="submit" value="Submit" id="myname" name="myname" title="mytitle"/></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
index b55832d..f9ffb30 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
+ <td colspan="2"><div align="right"><input type="image" alt="bar" id="myname" name="myname" disabled="disabled"/></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/731fde54/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
index 59b886d..cffacce 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
+ <td colspan="2"><div align="right"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname"/></div></td>
</tr>