You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/07/12 19:15:04 UTC
svn commit: r421326 - in
/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared:
renderkit/html/HtmlRendererUtils.java util/SelectItemsIterator.java
Author: matzew
Date: Wed Jul 12 10:15:03 2006
New Revision: 421326
URL: http://svn.apache.org/viewvc?rev=421326&view=rev
Log:
MYFACES-1261. thx to Çagatay Çivici
Modified:
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=421326&r1=421325&r2=421326&view=diff
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Wed Jul 12 10:15:03 2006
@@ -438,7 +438,7 @@
true); //default is to escape
}
- if (escape)
+ if (escape || selectItem.isEscape())
{
writer.writeText(selectItem.getLabel(), null);
} else
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java?rev=421326&r1=421325&r2=421326&view=diff
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/util/SelectItemsIterator.java Wed Jul 12 10:15:03 2006
@@ -75,12 +75,13 @@
String description = ((UISelectItem) child)
.getItemDescription();
boolean disabled = ((UISelectItem) child).isItemDisabled();
+ boolean escaped = ((UISelectItem) child).isItemEscaped();
if (label == null)
{
label = itemValue.toString();
}
item = new SelectItem(itemValue, label, description,
- disabled);
+ disabled, escaped);
}
else if (!(item instanceof SelectItem))
{