You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2005/10/13 10:27:34 UTC
svn commit: r320691 -
/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java
Author: mbr
Date: Thu Oct 13 01:27:30 2005
New Revision: 320691
URL: http://svn.apache.org/viewcvs?rev=320691&view=rev
Log:
fix for MYFACES-476, thanks to Csaba Sebastian
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java?rev=320691&r1=320690&r2=320691&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java Thu Oct 13 01:27:30 2005
@@ -27,6 +27,7 @@
import javax.faces.component.UIForm;
import javax.faces.component.ValueHolder;
import javax.faces.component.html.HtmlCommandButton;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.event.ActionEvent;
@@ -85,10 +86,15 @@
String image = getImage(uiComponent);
+ ExternalContext externalContext = facesContext.getExternalContext();
+
if (image != null)
{
writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_IMAGE, JSFAttr.TYPE_ATTR);
- writer.writeAttribute(HTML.SRC_ATTR, image, JSFAttr.IMAGE_ATTR);
+ String src = facesContext.getApplication().getViewHandler().getResourceURL(
+ facesContext, image);
+ writer.writeURIAttribute(HTML.SRC_ATTR, externalContext.encodeResourceURL(src),
+ JSFAttr.IMAGE_ATTR);
}
else
{
@@ -105,7 +111,7 @@
writer.writeAttribute(HTML.VALUE_ATTR, value, JSFAttr.VALUE_ATTR);
}
}
- if (JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
+ if (JavascriptUtils.isJavascriptAllowed(externalContext))
{
StringBuffer onClick = buildOnClick(uiComponent, facesContext, writer);
writer.writeAttribute(HTML.ONCLICK_ATTR, onClick.toString(), null);