You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/05/17 22:19:02 UTC
svn commit: r539100 - in /struts/struts2/branches/STRUTS_2_0_X/core/src:
main/resources/template/simple/ test/java/org/apache/struts2/views/jsp/ui/
test/resources/org/apache/struts2/views/jsp/ui/
Author: musachy
Date: Thu May 17 13:19:02 2007
New Revision: 539100
URL: http://svn.apache.org/viewvc?view=rev&rev=539100
Log:
WW-1752 cssStyle and cssClass are ignored in optiontransfer and doubleselect tags
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/doubleselect.ftl Thu May 17 13:19:02 2007
@@ -19,11 +19,11 @@
<#if parameters.doubleId?exists>
id="${parameters.doubleId?html}"<#rt/>
</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
+<#if parameters.doubleCss?exists>
+ class="${parameters.doubleCss?html}"<#rt/>
</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
+<#if parameters.doubleStyle?exists>
+ style="${parameters.doubleStyle?html}"<#rt/>
</#if>
<#if parameters.title?exists>
title="${parameters.title?html}"<#rt/>
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/template/simple/optiontransferselect.ftl Thu May 17 13:19:02 2007
@@ -184,11 +184,11 @@
<#if parameters.doubleId?exists><#t/>
id="${parameters.doubleId?html}"
</#if><#t/>
- <#if parameters.doubleCssClass?exists><#t/>
- class="${parameters.doubleCssClass?html}"
+ <#if parameters.doubleCss?exists><#t/>
+ class="${parameters.doubleCss?html}"
</#if><#t/>
- <#if parameters.doubleCssStyle?exists><#t/>
- style="${parameters.doubleCssStyle?html}"
+ <#if parameters.doubleStyle?exists><#t/>
+ style="${parameters.doubleStyle?html}"
</#if><#t/>
<#if parameters.doubleOnclick?exists><#t/>
onclick="${parameters.doubleOnclick?html}"
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java Thu May 17 13:19:02 2007
@@ -84,6 +84,12 @@
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();
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java Thu May 17 13:19:02 2007
@@ -60,6 +60,8 @@
tag.setDoubleSize("20");
tag.setMultiple("true");
tag.setDoubleEmptyOption("true");
+ tag.setDoubleCssClass("c2");
+ tag.setDoubleCssStyle("s2");
tag.setAllowAddAllToLeft("true");
tag.setAllowAddAllToRight("true");
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt Thu May 17 13:19:02 2007
@@ -1,12 +1,12 @@
<tr>
<td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
<td>
-<select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
+<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
<option value="BE">Belgium</option>
<option value="FR">France</option>
</select>
<br/>
-<select name="region">
+<select name="region" class="c2" style="s2">
</select>
<script type="text/javascript">
var fooGroup = new Array(2 + 0);
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt?view=diff&rev=539100&r1=539099&r2=539100
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt Thu May 17 13:19:02 2007
@@ -34,6 +34,8 @@
size="20"
multiple="multiple"
id="doubleId"
+ class="c2"
+ style="s2"
>
<option value="Double Header Key">Double Header Value</option>
<option value=""></option>