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/06/05 03:03:38 UTC
svn commit: r951627 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
Author: lu4242
Date: Sat Jun 5 01:03:37 2010
New Revision: 951627
URL: http://svn.apache.org/viewvc?rev=951627&view=rev
Log:
TOMAHAWK-1516 t:toggleLink render end when enabledOnUserRole is used
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java?rev=951627&r1=951626&r2=951627&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java Sat Jun 5 01:03:37 2010
@@ -51,33 +51,39 @@ public class ToggleLinkRenderer extends
protected void renderOutputLinkStart(FacesContext facesContext,
UIOutput output) throws IOException
{
- if (UserRoleUtils.isEnabledOnUserRole(output))
- {
- ResponseWriter writer = facesContext.getResponseWriter();
+ ResponseWriter writer = facesContext.getResponseWriter();
+
+ String clientId = output.getClientId(facesContext);
+
+ //write anchor
+ writer.startElement(HTML.ANCHOR_ELEM, output);
+ writer.writeAttribute(HTML.ID_ATTR, clientId, null);
+ writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
+ writer.writeURIAttribute(HTML.HREF_ATTR, "javascript:void(0);", null);
- String clientId = output.getClientId(facesContext);
+ HtmlRendererUtils
+ .renderHTMLAttributes(
+ writer,
+ output,
+ org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR,
+ output.getAttributes().get(HTML.STYLE_ATTR));
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR,
+ output.getAttributes().get(HTML.STYLE_CLASS_ATTR));
+
+ HtmlRendererUtils.renderHTMLAttribute(writer, HTML.ONCLICK_ATTR, HTML.ONCLICK_ATTR,
+ buildOnclickToggleFunction(facesContext,output));
+
+ writer.flush();
+ }
- //write anchor
- writer.startElement(HTML.ANCHOR_ELEM, output);
- writer.writeAttribute(HTML.ID_ATTR, clientId, null);
- writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
- writer.writeURIAttribute(HTML.HREF_ATTR, "javascript:void(0);", null);
-
- HtmlRendererUtils
- .renderHTMLAttributes(
- writer,
- output,
- org.apache.myfaces.shared_tomahawk.renderkit.html.HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES_WITHOUT_ONCLICK_WITHOUT_STYLE);
- HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_ATTR, HTML.STYLE_ATTR,
- output.getAttributes().get(HTML.STYLE_ATTR));
- HtmlRendererUtils.renderHTMLAttribute(writer, HTML.STYLE_CLASS_ATTR, HTML.STYLE_CLASS_ATTR,
- output.getAttributes().get(HTML.STYLE_CLASS_ATTR));
-
- HtmlRendererUtils.renderHTMLAttribute(writer, HTML.ONCLICK_ATTR, HTML.ONCLICK_ATTR,
- buildOnclickToggleFunction(facesContext,output));
-
- writer.flush();
- }
+ protected void renderOutputLinkEnd(FacesContext facesContext, UIComponent component)
+ throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ // force separate end tag
+ writer.writeText("", null);
+ writer.endElement(HTML.ANCHOR_ELEM);
}
private String buildOnclickToggleFunction(FacesContext facesContext,
@@ -189,6 +195,6 @@ public class ToggleLinkRenderer extends
private boolean isDisabled(FacesContext facesContext, ToggleLink link) {
TogglePanel panel = getParentTogglePanel(facesContext, link);
- return panel.isDisabled() || link.isDisabled();
+ return panel.isDisabled() || link.isDisabled() || UserRoleUtils.isEnabledOnUserRole(link);
}
}