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 2010/05/06 08:09:03 UTC
svn commit: r941584 - in
/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlBodyRendererBase.java HtmlGridRendererBase.java
HtmlImageRendererBase.java HtmlLinkRendererBase.java
HtmlTableRendererBase.java
Author: lu4242
Date: Thu May 6 06:09:03 2010
New Revision: 941584
URL: http://svn.apache.org/viewvc?rev=941584&view=rev
Log:
MYFACES-2350 All renderers of components that implements ClientBehaviorHolder should encode javascript attributes
Modified:
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java?rev=941584&r1=941583&r2=941584&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java Thu May 6 06:09:03 2010
@@ -44,6 +44,15 @@ public class HtmlBodyRendererBase extend
{
@Override
+ public void decode(FacesContext context, UIComponent component)
+ {
+ // check for npe
+ super.decode(context, component);
+
+ HtmlRendererUtils.decodeClientBehaviors(context, component);
+ }
+
+ @Override
public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=941584&r1=941583&r2=941584&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Thu May 6 06:09:03 2010
@@ -59,6 +59,15 @@ public class HtmlGridRendererBase
return true;
}
+ @Override
+ public void decode(FacesContext context, UIComponent component)
+ {
+ // Check for npe
+ super.decode(context, component);
+
+ HtmlRendererUtils.decodeClientBehaviors(context, component);
+ }
+
public void encodeBegin(FacesContext facesContext, UIComponent component)
throws IOException
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?rev=941584&r1=941583&r2=941584&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Thu May 6 06:09:03 2010
@@ -51,6 +51,14 @@ public class HtmlImageRendererBase
{
//private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
private static final Logger log = Logger.getLogger(HtmlImageRendererBase.class.getName());
+
+ public void decode(FacesContext context, UIComponent component)
+ {
+ //check for npe
+ super.decode(context, component);
+
+ HtmlRendererUtils.decodeClientBehaviors(context, component);
+ }
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
throws IOException
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=941584&r1=941583&r2=941584&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Thu May 6 06:09:03 2010
@@ -97,6 +97,11 @@ public abstract class HtmlLinkRendererBa
else if (component instanceof UIOutput)
{
//do nothing
+ if (component instanceof ClientBehaviorHolder &&
+ !HtmlRendererUtils.isDisabled(component))
+ {
+ HtmlRendererUtils.decodeClientBehaviors(facesContext, component);
+ }
}
else
{
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=941584&r1=941583&r2=941584&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Thu May 6 06:09:03 2010
@@ -1129,6 +1129,8 @@ public class HtmlTableRendererBase exten
public void decode(FacesContext context, UIComponent component)
{
super.decode(context, component);
+
+ HtmlRendererUtils.decodeClientBehaviors(context, component);
}
}