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 2014/01/02 22:14:01 UTC

svn commit: r1554918 - /myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Author: lu4242
Date: Thu Jan  2 21:14:00 2014
New Revision: 1554918

URL: http://svn.apache.org/r1554918
Log:
MYFACES-3836 f:ajax disabled=false in commandButton with onclick prevents form submission

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

Modified: myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1554918&r1=1554917&r2=1554918&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Thu Jan  2 21:14:00 2014
@@ -2017,7 +2017,9 @@ public final class HtmlRendererUtils
                 target.append(", ");
             }
         }
-        if (!submitting)
+        // MYFACES-3836 If no script provided by the client behavior, ignore the 
+        // submitting hint because. it is evidence the client behavior is disabled.
+        if (script != null && !submitting)
         {
             submitting = clientBehavior.getHints().contains(
                     ClientBehaviorHint.SUBMITTING);
@@ -2997,4 +2999,4 @@ public final class HtmlRendererUtils
             super(buf, prettyPrint);
         }
     }
-}
\ No newline at end of file
+}