You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/08/13 21:57:51 UTC

svn commit: r685654 - in /myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext: HtmlCheckboxRenderer.java HtmlRadioRenderer.java

Author: lu4242
Date: Wed Aug 13 12:57:50 2008
New Revision: 685654

URL: http://svn.apache.org/viewvc?rev=685654&view=rev
Log:
TOMAHAWK-1314 Escape attribute in radio and checkbox not working (thanks to Paul Rivera)

Modified:
    myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
    myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java

Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java?rev=685654&r1=685653&r2=685654&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java Wed Aug 13 12:57:50 2008
@@ -275,7 +275,14 @@
 
             writer.startElement(HTML.LABEL_ELEM, selectMany);
             renderLabelClassIfNecessary(facesContext, selectMany, disabled);
-            writer.writeText(selectItem.getLabel(), null);
+            if(selectItem.isEscape())
+            {
+                writer.writeText(selectItem.getLabel(), null);
+            }
+            else
+            {
+                writer.write(selectItem.getLabel());
+            }
             renderCheckbox(facesContext, selectMany, itemStrValue, disabled, checked, false,0);
             writer.endElement(HTML.LABEL_ELEM);
         }

Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java?rev=685654&r1=685653&r2=685654&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java Wed Aug 13 12:57:50 2008
@@ -169,7 +169,7 @@
         boolean itemDisabled = selectItem.isDisabled();
         boolean disabled = (componentDisabled || itemDisabled);
 
-        HtmlRendererUtils.renderLabel(writer, uiSelectOne, itemId, selectItem.getLabel(), disabled);
+        HtmlRendererUtils.renderLabel(writer, uiSelectOne, itemId, selectItem, disabled);
     }