svn commit: r1533193 - in /myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html: HtmlButtonRendererBase.java HtmlLinkRendererBase.java

[lu...@apache.org]

Author: lu4242
Date: Thu Oct 17 18:19:34 2013
New Revision: 1533193

URL: http://svn.apache.org/r1533193
Log:
MYFACES-3719 Executing action of a disabled Button (thanks to Dennis Hoersch for provide this patch)

Modified:
    myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
    myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java

Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?rev=1533193&r1=1533192&r2=1533193&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Thu Oct 17 18:19:34 2013
@@ -68,7 +68,9 @@ public class HtmlButtonRendererBase
                 facesContext, uiComponent, UICommand.class);
 
         //super.decode must not be called, because value is handled here
-        if (!isReset(uiComponent) && isSubmitted(facesContext, uiComponent))
+        boolean disabled = isDisabled(facesContext, uiComponent);
+        if (!isReset(uiComponent) && isSubmitted(facesContext, uiComponent) &&
+            !disabled)
         {
             uiComponent.queueEvent(new ActionEvent(uiComponent));
 
@@ -77,7 +79,7 @@ public class HtmlButtonRendererBase
         }
         
         if (uiComponent instanceof ClientBehaviorHolder &&
-                !HtmlRendererUtils.isDisabled(uiComponent))
+                !disabled)
         {
             HtmlRendererUtils.decodeClientBehaviors(facesContext, uiComponent);
         }

Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=1533193&r1=1533192&r2=1533193&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Thu Oct 17 18:19:34 2013
@@ -84,7 +84,8 @@ public abstract class HtmlLinkRendererBa
         {
             String clientId = component.getClientId(facesContext);
             FormInfo formInfo = findNestingForm(component, facesContext);
-            if (formInfo != null)
+            boolean disabled = HtmlRendererUtils.isDisabled(component);
+            if (formInfo != null && !disabled)
             {
                 String reqValue = (String) facesContext.getExternalContext().getRequestParameterMap().get(
                         HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo, facesContext));
@@ -97,7 +98,7 @@ public abstract class HtmlLinkRendererBa
                 }
             }
             if (component instanceof ClientBehaviorHolder &&
-                    !HtmlRendererUtils.isDisabled(component))
+                    !disabled)
             {
                 HtmlRendererUtils.decodeClientBehaviors(facesContext, component);
             }