Repository: struts Updated Branches: refs/heads/master 26fa06b11 -> f487d7e7d
WW-4747 s:file generates input tag with "value" attribute Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f487d7e7 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f487d7e7 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f487d7e7 Branch: refs/heads/master Commit: f487d7e7d69c767949a59f36ceb5a45d96eb32dd Parents: 26fa06b Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Mon Feb 27 22:42:46 2017 +0200 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Mon Feb 27 22:42:46 2017 +0200 ---------------------------------------------------------------------- core/src/main/resources/template/simple/file.ftl | 1 - core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java | 2 +- core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/f487d7e7/core/src/main/resources/template/simple/file.ftl ---------------------------------------------------------------------- diff --git a/core/src/main/resources/template/simple/file.ftl b/core/src/main/resources/template/simple/file.ftl index f0a1140..9e7a380 100644 --- a/core/src/main/resources/template/simple/file.ftl +++ b/core/src/main/resources/template/simple/file.ftl @@ -25,7 +25,6 @@ <#if parameters.get("size")?has_content> size="${parameters.get("size")?html}"<#rt/> </#if> - value=""<#rt/> <#if parameters.disabled!false> disabled="disabled"<#rt/> </#if> http://git-wip-us.apache.org/repos/asf/struts/blob/f487d7e7/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java index bd316f6..ad709e9 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/FileTest.java @@ -66,7 +66,7 @@ public class FileTest extends AbstractUITagTest { Map result = super.initializedGenericTagTestProperties(); new PropertyHolder("accept", "someAccepted").addToMap(result); new PropertyHolder("size", "101").addToMap(result); - new PropertyHolder("value", "").addToMap(result); + new PropertyHolder("value", "", "").addToMap(result); return result; } http://git-wip-us.apache.org/repos/asf/struts/blob/f487d7e7/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt ---------------------------------------------------------------------- diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt index 124c221..acfeb26 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/File-1.txt @@ -1,4 +1,4 @@ <tr> <td class="tdLabel"><label for="myname" class="label">mylabel:</label></td> - <td class="tdInput"><input type="file" name="myname" size="10" value="" accept="*.txt" id="myname" title="mytitle"/></td> + <td class="tdInput"><input type="file" name="myname" size="10" accept="*.txt" id="myname" title="mytitle"/></td> </tr>
