You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/05/23 03:37:35 UTC
svn commit: r177866 -
/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java
/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
Author: schof
Date: Sun May 22 18:37:34 2005
New Revision: 177866
URL: http://svn.apache.org/viewcvs?rev=177866&view=rev
Log:
Fixes MyFaces-204. Thanks to Pino Mahoney for the patch.
Modified:
myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java
myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
Modified: myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java?rev=177866&r1=177865&r2=177866&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HTML.java Sun May 22 18:37:34 2005
@@ -20,7 +20,7 @@
/**
* Constant declarations for HTML rendering.
- * @author Manfred Geiler (latest modification by $Author$)
+ * @author Manfred Geiler
* @author Anton Koinov
* @version $Revision$ $Date$
*/
@@ -133,6 +133,10 @@
(String[]) ArrayUtils.concat(
EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
UNIVERSAL_ATTRIBUTES);
+ public static final String[] COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
+ (String[]) ArrayUtils.concat(
+ EVENT_HANDLER_ATTRIBUTES_WITHOUT_ONCLICK,
+ UNIVERSAL_ATTRIBUTES_WITHOUT_STYLE);
public static final String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED =
(String[]) ArrayUtils.concat(
COMMON_PASSTROUGH_ATTRIBUTES,
@@ -175,6 +179,10 @@
(String[]) ArrayUtils.concat(
ANCHOR_ATTRIBUTES,
COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE);
+ public static final String[] ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE =
+ (String[]) ArrayUtils.concat(
+ ANCHOR_ATTRIBUTES,
+ COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
// <form>
public static final String ACCEPT_CHARSET_ATTR = "accept-charset";
Modified: myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java?rev=177866&r1=177865&r2=177866&view=diff
==============================================================================
--- myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/trunk/src/share/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java Sun May 22 18:37:34 2005
@@ -35,7 +35,7 @@
import java.util.Iterator;
/**
- * @author Manfred Geiler (latest modification by $Author$)
+ * @author Manfred Geiler
* @version $Revision$ $Date$
*/
public abstract class HtmlLinkRendererBase
@@ -151,18 +151,21 @@
{
ResponseWriter writer = facesContext.getResponseWriter();
+ String[] anchorAttrsToRender;
if (JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
{
renderJavaScriptAnchorStart(facesContext, writer, component, clientId);
+ anchorAttrsToRender = HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE;
}
else
{
renderNonJavaScriptAnchorStart(facesContext, writer, component, clientId);
+ anchorAttrsToRender = HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE;
}
writer.writeAttribute(HTML.ID_ATTR, clientId, null);
HtmlRendererUtils.renderHTMLAttributes(writer, component,
- HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_STYLE);
+ anchorAttrsToRender);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR,
style);
HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR,