You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/03/16 21:41:12 UTC
cvs commit: incubator-myfaces/src/share/org/apache/myfaces/renderkit/html HtmlButtonRendererBase.java
mmarinschek 2005/03/16 12:41:12
Modified: src/share/org/apache/myfaces/renderkit/html
HtmlButtonRendererBase.java
Log:
fix for MYFACES-111, alien commit for Heath Borders
Revision Changes Path
1.9 +13 -9 incubator-myfaces/src/share/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java
Index: HtmlButtonRendererBase.java
===================================================================
RCS file: /home/cvs/incubator-myfaces/src/share/org/apache/myfaces/renderkit/html/HtmlButtonRendererBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HtmlButtonRendererBase.java 13 Oct 2004 11:51:01 -0000 1.8
+++ HtmlButtonRendererBase.java 16 Mar 2005 20:41:12 -0000 1.9
@@ -1,12 +1,12 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,6 +40,9 @@
* @author Anton Koinov
* @version $Revision$ $Date$
* $Log$
+ * Revision 1.9 2005/03/16 20:41:12 mmarinschek
+ * fix for MYFACES-111, alien commit for Heath Borders
+ *
* Revision 1.8 2004/10/13 11:51:01 matze
* renamed packages to org.apache
*
@@ -94,7 +97,7 @@
Map paramMap = facesContext.getExternalContext().getRequestParameterMap();
return paramMap.containsKey(clientId) || paramMap.containsKey(clientId + IMAGE_BUTTON_SUFFIX_X) || paramMap.containsKey(clientId + IMAGE_BUTTON_SUFFIX_Y);
}
-
+
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
throws IOException
{
@@ -133,7 +136,8 @@
}
if (JavascriptUtils.isJavascriptAllowed(facesContext.getExternalContext()))
{
- renderClearFormOnClick(uiComponent, facesContext, writer);
+ StringBuffer onClick = buildOnClick(uiComponent, facesContext, writer);
+ writer.writeAttribute(HTML.ONCLICK_ATTR, onClick.toString(), null);
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
HTML.BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONCLICK);
}
@@ -152,7 +156,7 @@
}
- private void renderClearFormOnClick(UIComponent uiComponent, FacesContext facesContext, ResponseWriter writer)
+ protected StringBuffer buildOnClick(UIComponent uiComponent, FacesContext facesContext, ResponseWriter writer)
throws IOException
{
//Find form
@@ -207,7 +211,7 @@
dummyFormResponseWriter.addDummyFormParameter(hiddenFieldName);
}
- writer.writeAttribute(HTML.ONCLICK_ATTR, onClick.toString(), null);
+ return onClick;
}