diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl index 92dbb7439..9bb864f9a 100644 --- a/core/src/main/resources/template/simple/doubleselect.ftl +++ b/core/src/main/resources/template/simple/doubleselect.ftl @@ -19,11 +19,11 @@ <#if parameters.doubleId?exists> id="${parameters.doubleId?html}"<#rt/> -<#if parameters.cssClass?exists> - class="${parameters.cssClass?html}"<#rt/> +<#if parameters.doubleCss?exists> + class="${parameters.doubleCss?html}"<#rt/> -<#if parameters.cssStyle?exists> - style="${parameters.cssStyle?html}"<#rt/> +<#if parameters.doubleStyle?exists> + style="${parameters.doubleStyle?html}"<#rt/> <#if parameters.title?exists> title="${parameters.title?html}"<#rt/> diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl index 000a4c4de..3f0cf6ced 100644 --- a/core/src/main/resources/template/simple/optiontransferselect.ftl +++ b/core/src/main/resources/template/simple/optiontransferselect.ftl @@ -184,11 +184,11 @@ <#if parameters.doubleId?exists><#t/> id="${parameters.doubleId?html}" <#t/> - <#if parameters.doubleCssClass?exists><#t/> - class="${parameters.doubleCssClass?html}" + <#if parameters.doubleCss?exists><#t/> + class="${parameters.doubleCss?html}" <#t/> - <#if parameters.doubleCssStyle?exists><#t/> - style="${parameters.doubleCssStyle?html}" + <#if parameters.doubleStyle?exists><#t/> + style="${parameters.doubleStyle?html}" <#t/> <#if parameters.doubleOnclick?exists><#t/> onclick="${parameters.doubleOnclick?html}" diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java index 6eafe1082..44c0a5c4a 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java @@ -84,6 +84,12 @@ public class DoubleSelectTest extends AbstractUITagTest { tag.setOnmouseover("window.status='onmouseover';"); tag.setOnmouseup("window.status='onmouseup';"); + //css style and class + tag.setCssClass("c1"); + tag.setCssStyle("s1"); + tag.setDoubleCssClass("c2"); + tag.setDoubleCssStyle("s2"); + tag.doStartTag(); tag.doEndTag(); diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java index 1a1af11ff..0c2c908a2 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java @@ -60,6 +60,8 @@ public class OptionTransferSelectTagTest extends AbstractUITagTest { tag.setDoubleSize("20"); tag.setMultiple("true"); tag.setDoubleEmptyOption("true"); + tag.setDoubleCssClass("c2"); + tag.setDoubleCssStyle("s2"); tag.setAllowAddAllToLeft("true"); tag.setAllowAddAllToRight("true"); diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt index b306be4ee..3d4b5b6fd 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt @@ -1,12 +1,12 @@ -
-