svn commit: r920531 - /myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

[ja...@apache.org]

Author: jakobk
Date: Mon Mar  8 21:44:46 2010
New Revision: 920531

URL: http://svn.apache.org/viewvc?rev=920531&view=rev
Log:
MYFACES-2591 buildBehaviorChain() should also check the ClientBehaviors for the second eventName for submitting

Modified:
    myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=920531&r1=920530&r2=920531&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Mon Mar  8 21:44:46 2010
@@ -2254,10 +2254,13 @@
         ScriptContext behaviorCode = new ScriptContext();
         ScriptContext retVal = new ScriptContext(currentInstance.isPrettyHtml());
 
-        boolean submitting = getClientBehaviorScript(facesContext, uiComponent, clientBehaviors,
+        boolean submitting1 = getClientBehaviorScript(facesContext, uiComponent, clientBehaviors,
                 behaviorCode, eventName1, params);
-        getClientBehaviorScript(facesContext, uiComponent, clientBehaviors, 
+        boolean submitting2 = getClientBehaviorScript(facesContext, uiComponent, clientBehaviors, 
                 behaviorCode, eventName2, params);
+        
+        // ClientBehaviors for both events have to be checked for the Submitting hint
+        boolean submitting = submitting1 || submitting2;
 
         if (behaviorCode != null
                 && !behaviorCode.toString().trim().equals(STR_EMPTY))