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 2012/03/30 05:34:54 UTC
svn commit: r1307227 -
/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Author: lu4242
Date: Fri Mar 30 03:34:54 2012
New Revision: 1307227
URL: http://svn.apache.org/viewvc?rev=1307227&view=rev
Log:
MYFACES-3513 Invalid chaining of client behavior scripts when using both, explicitly provided event and default event
Modified:
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1307227&r1=1307226&r2=1307227&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Fri Mar 30 03:34:54 2012
@@ -2150,9 +2150,11 @@ public final class HtmlRendererUtils
boolean submitting1 = getClientBehaviorScript(facesContext,
uiComponent, targetClientId, eventName1, clientBehaviors,
behaviorCode, params);
+ ScriptContext behaviorCode2 = new ScriptContext();
boolean submitting2 = getClientBehaviorScript(facesContext,
uiComponent, targetClientId, eventName2, clientBehaviors,
- behaviorCode, params2);
+ behaviorCode2, params2);
+
// ClientBehaviors for both events have to be checked for the Submitting hint
boolean submitting = submitting1 || submitting2;
if (behaviorCode != null
@@ -2160,6 +2162,11 @@ public final class HtmlRendererUtils
{
finalParams.add(behaviorCode.toString());
}
+ if (behaviorCode2 != null
+ && !behaviorCode2.toString().trim().equals(STR_EMPTY))
+ {
+ finalParams.add(behaviorCode2.toString());
+ }
if (serverEventCode != null
&& !serverEventCode.trim().equals(STR_EMPTY))
{