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 2008/04/11 22:18:03 UTC
svn commit: r647298 -
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
Author: lu4242
Date: Fri Apr 11 13:18:02 2008
New Revision: 647298
URL: http://svn.apache.org/viewvc?rev=647298&view=rev
Log:
fix MYFACES-1857 h:commandLink with onclick="customFunction" does not do what taglib javadoc of jsf ri suggest to do
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=647298&r1=647297&r2=647298&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Fri Apr 11 13:18:02 2008
@@ -244,8 +244,11 @@
}
if (commandOnclick != null)
{
+ onClick.append("var cf = function(){");
onClick.append(commandOnclick);
+ onClick.append('}');
onClick.append(';');
+ onClick.append("var oamSF = function(){");
}
if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm())) {
@@ -280,6 +283,13 @@
//addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
}
+
+ if (commandOnclick != null)
+ {
+ onClick.append('}');
+ onClick.append(';');
+ onClick.append("return (cf()==false)? false : oamSF();");
+ }
writer.startElement(HTML.ANCHOR_ELEM, component);
writer.writeURIAttribute(HTML.HREF_ATTR, "#", null);