You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by vo...@apache.org on 2022/12/12 14:20:02 UTC
[myfaces] branch main updated: ensure top level ul does not have border attribute fix style errors
This is an automated email from the ASF dual-hosted git repository.
volosied pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 05cfe391f ensure top level ul does not have border attribute fix style errors
new 67f37c683 Merge pull request #419 from KyleAure/1574-layout-list-without-border
05cfe391f is described below
commit 05cfe391f3852414a47e7e0ac54f2d015cf38fef
Author: Kyle Aure <Ky...@gmail.com>
AuthorDate: Fri Dec 9 14:02:11 2022 -0600
ensure top level ul does not have border attribute
fix style errors
---
.../myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java | 9 ++++++++-
.../myfaces/renderkit/html/base/HtmlRadioRendererBase.java | 10 ++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
index 002308ca7..339ea67f2 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
@@ -141,7 +141,14 @@ public class HtmlCheckboxRendererBase extends HtmlRenderer
ResponseWriter writer = facesContext.getResponseWriter();
writer.startElement(usingTable != null ? HTML.TABLE_ELEM : HTML.UL_ELEM, selectMany);
- HtmlRendererUtils.renderHTMLAttributes(writer, selectMany, HTML.SELECT_TABLE_PASSTHROUGH_ATTRIBUTES);
+ if(usingTable != null)
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, selectMany, HTML.SELECT_TABLE_PASSTHROUGH_ATTRIBUTES);
+ }
+ else
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, selectMany, HTML.UL_PASSTHROUGH_ATTRIBUTES);
+ }
Map<String, List<ClientBehavior>> behaviors = null;
if (selectMany instanceof ClientBehaviorHolder)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
index 0877e6a97..28906dce1 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
@@ -164,8 +164,14 @@ public class HtmlRadioRendererBase extends HtmlRenderer
{
// Render as single component
writer.startElement(usingTable != null ? HTML.TABLE_ELEM : HTML.UL_ELEM, selectOne);
- HtmlRendererUtils.renderHTMLAttributes(writer, selectOne,
- HTML.SELECT_TABLE_PASSTHROUGH_ATTRIBUTES);
+ if(usingTable != null)
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, selectOne, HTML.SELECT_TABLE_PASSTHROUGH_ATTRIBUTES);
+ }
+ else
+ {
+ HtmlRendererUtils.renderHTMLAttributes(writer, selectOne, HTML.UL_PASSTHROUGH_ATTRIBUTES);
+ }
if (behaviors != null && !behaviors.isEmpty())
{