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-4630 - <s:submit> generates a value attribute for type=image which violates W3C

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2016-05-04 22:54:28 +03:00
parent f238cf4f10
commit c4d2b687be
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/simple/submit.ftl
+3 -3
View File
@@ -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>
core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java
+1 -1
View File
@@ -232,7 +232,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());
}
/**
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="bar" disabled="disabled" tabindex="1"/></div></td>
<td colspan="2"><div class="formButton"><input type="submit" value="bar" id="myname" name="myname" disabled="disabled" tabindex="1"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><input type="submit" id="myname" name="myname" value="Submit" title="mytitle"/></div></td>
<td colspan="2"><div class="formButton"><input type="submit" value="Submit" id="myname" name="myname" title="mytitle"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" value="bar" disabled="disabled"/></div></td>
<td colspan="2"><div class="formButton"><input type="image" alt="bar" id="myname" name="myname" disabled="disabled"/></div></td>
</tr>
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
+1 -1
View File
@@ -1,3 +1,3 @@
<tr>
<td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname" value="bar"/></div></td>
<td colspan="2"><div class="formButton"><input type="image" alt="mylabel" src="some.gif" id="myname" name="myname"/></div></td>
</tr>