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 2012/03/09 22:14:57 UTC
svn commit: r1299050 - in /myfaces/core/trunk:
impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
Author: lu4242
Date: Fri Mar 9 21:14:56 2012
New Revision: 1299050
URL: http://svn.apache.org/viewvc?rev=1299050&view=rev
Log:
MYFACES-3490 <h:commandButton> doesn't render styleClass with JavaScript disabled in web.xml
Modified:
myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java?rev=1299050&r1=1299049&r2=1299050&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlButtonRendererTest.java Fri Mar 9 21:14:56 2012
@@ -91,6 +91,8 @@ public class HtmlButtonRendererTest exte
new HtmlRenderedAttr("dir"),
new HtmlRenderedAttr("lang"),
new HtmlRenderedAttr("title"),
+
+ /* If js is set to false, no need to bother over event attributes
//_FocusBlurProperties
new HtmlRenderedAttr("onfocus"),
new HtmlRenderedAttr("onblur"),
@@ -108,12 +110,21 @@ public class HtmlButtonRendererTest exte
new HtmlRenderedAttr("onmouseout"),
new HtmlRenderedAttr("onmouseover"),
new HtmlRenderedAttr("onmouseup"),
+ */
+
//_StyleProperties
new HtmlRenderedAttr("style"),
new HtmlRenderedAttr("styleClass", "styleClass", "class=\"styleClass\""),
//_TabindexProperty
new HtmlRenderedAttr("tabindex")
};
+
+ MockServletContext servletContext = new MockServletContext();
+ servletContext.addInitParameter("org.apache.myfaces.ALLOW_JAVASCRIPT", "false");
+ MockExternalContext mockExtCtx = new MockExternalContext(servletContext,
+ new MockHttpServletRequest(), new MockHttpServletResponse());
+ MyfacesConfig config = MyfacesConfig.getCurrentInstance(mockExtCtx);
+ facesContext.setExternalContext(mockExtCtx);
HtmlCheckAttributesUtil.checkRenderedAttributes(
commandButton, facesContext, writer, attrs);
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=1299050&r1=1299049&r2=1299050&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 Fri Mar 9 21:14:56 2012
@@ -251,8 +251,8 @@ public class HtmlButtonRendererBase
}
}
- if (javascriptAllowed)
- {
+ //if (javascriptAllowed)
+ //{
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
CommonPropertyUtils.renderButtonPassthroughPropertiesWithoutDisabledAndEvents(writer,
@@ -263,9 +263,8 @@ public class HtmlButtonRendererBase
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
HTML.BUTTON_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_EVENTS);
}
- }
+ //}
-
if (behaviors != null && !behaviors.isEmpty())
{
HtmlRendererUtils.renderBehaviorizedEventHandlersWithoutOnclick(