You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/05/19 11:37:41 UTC

svn commit: r170899 - /myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java

Author: svieujot
Date: Thu May 19 02:37:41 2005
New Revision: 170899

URL: http://svn.apache.org/viewcvs?rev=170899&view=rev
Log:
displayValueOnly bugfixes.

Modified:
    myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java

Modified: myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java?rev=170899&r1=170898&r2=170899&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java Thu May 19 02:37:41 2005
@@ -35,8 +35,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.config.MyfacesConfig;
 import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
 import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
+import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
 import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
 import org.apache.myfaces.component.DisplayValueOnlyCapable;
 
@@ -624,11 +624,11 @@
             
             if(getDisplayValueOnlyStyleClass(uiComponent) != null )
             {
-                writer.writeAttribute(HTML.STYLE_CLASS_ATTR, getDisplayValueOnlyStyleClass(uiComponent), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, getDisplayValueOnlyStyleClass(uiComponent), null);
             }
             else if(uiComponent.getAttributes().get("styleClass")!=null)
             {
-                writer.writeAttribute(HTML.STYLE_CLASS_ATTR, uiComponent.getAttributes().get("styleClass"), null);
+                writer.writeAttribute(HTML.CLASS_ATTR, uiComponent.getAttributes().get("styleClass"), null);
             }
 
             renderHTMLAttributes(writer, uiComponent,
@@ -749,7 +749,7 @@
         renderDisplayValueOnlyAttributes(input, writer);
 
         String strValue = RendererUtils.getStringValue(facesContext, input);
-        writer.writeText(strValue, JSFAttr.VALUE_ATTR);
+        writer.write( HTMLEncoder.encode(strValue, true, true) );
 
         writer.endElement(HTML.SPAN_ELEM);
     }