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/09/10 23:10:31 UTC

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

Author: lu4242
Date: Thu Sep 10 21:10:31 2009
New Revision: 813590

URL: http://svn.apache.org/viewvc?rev=813590&view=rev
Log:
MYFACES-2349 h:commandButton allows type="button" on jsf 2.0

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

Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?rev=813590&r1=813589&r2=813590&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Thu Sep 10 21:10:31 2009
@@ -73,6 +73,11 @@
     {
         return "reset".equals((String) uiComponent.getAttributes().get(HTML.TYPE_ATTR));
     }
+    
+    private static boolean isButton(UIComponent uiComponent)
+    {
+        return "button".equals((String) uiComponent.getAttributes().get(HTML.TYPE_ATTR));
+    }
 
     private static boolean isSubmitted(FacesContext facesContext, UIComponent uiComponent)
     {
@@ -122,7 +127,7 @@
         {
             String type = getType(uiComponent);
 
-            if (type == null || !isReset(uiComponent))
+            if (type == null || (!isReset(uiComponent) && !isButton(uiComponent)))
             {
                 type = HTML.INPUT_TYPE_SUBMIT;
             }