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 2009/06/15 06:14:40 UTC
svn commit: r784648 -
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
Author: lu4242
Date: Mon Jun 15 04:14:39 2009
New Revision: 784648
URL: http://svn.apache.org/viewvc?rev=784648&view=rev
Log:
TOMAHAWK-1428 t:toggleLink onclick does not allow javascript than could prevent toggle
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=784648&r1=784647&r2=784648&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 Mon Jun 15 04:14:39 2009
@@ -103,13 +103,24 @@
String outputOnclick = toggleLink.getOnclick();
StringBuffer onClick = new StringBuffer();
- if(outputOnclick != null) {
+ if(outputOnclick != null)
+ {
+ onClick.append("var cf = function(){");
onClick.append(outputOnclick);
- onClick.append(";");
+ onClick.append('}');
+ onClick.append(';');
+ onClick.append("var oamSF = function(){");
}
String onClickFocusClientId = toggleLink.getOnClickFocusId() != null ? toggleLink.findComponent(toggleLink.getOnClickFocusId()).getClientId(facesContext) : "";
onClick.append(getToggleJavascriptFunctionName(facesContext, toggleLink) + "('"+idsToShow+"','" + idsToHide + "','" + getHiddenFieldId(facesContext, togglePanel) + "','" + onClickFocusClientId + "');");
+
+ if (outputOnclick != null)
+ {
+ onClick.append('}');
+ onClick.append(';');
+ onClick.append("return (cf()==false)? false : oamSF();");
+ }
return onClick.toString();
}