From 40f7b39c3f1f99de1806a5afb84166090f00d4ce Mon Sep 17 00:00:00 2001 From: gregh3269 Date: Wed, 10 Feb 2016 08:53:32 +0000 Subject: [PATCH 1/2] Allow html5 attributes --- .../apache/struts2/views/java/simple/TextFieldHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java index ba5a689625..d79e4d38a9 100644 --- a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java +++ b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java @@ -31,8 +31,8 @@ public class TextFieldHandler extends AbstractTagHandler implements TagGenerator public void generate() throws IOException { Map params = context.getParameters(); Attributes attr = new Attributes(); - - attr.add("type", "text") + Object type = params.get("type"); + attr.add("type", type == null ? "text" : (String) type) .addDefaultToEmpty("name", params.get("name")) .addIfExists("size", params.get("size")) .addIfExists("maxlength", params.get("maxlength")) From d397abcfc130056039e5e9744135ce3b736704ff Mon Sep 17 00:00:00 2001 From: gregh3269 Date: Wed, 10 Feb 2016 11:12:10 +0000 Subject: [PATCH 2/2] html5 attributes again --- .../org/apache/struts2/views/java/simple/TextFieldHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java index d79e4d38a9..29921f134c 100644 --- a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java +++ b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java @@ -32,7 +32,7 @@ public void generate() throws IOException { Map params = context.getParameters(); Attributes attr = new Attributes(); Object type = params.get("type"); - attr.add("type", type == null ? "text" : (String) type) + attr.add("type", type == null ? "text" : type.toString()) .addDefaultToEmpty("name", params.get("name")) .addIfExists("size", params.get("size")) .addIfExists("maxlength", params.get("maxlength"))