From 4385a67338ffbae310ce4dba33b8e763f715c5eb Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Fri, 2 Sep 2022 09:56:47 -0400 Subject: [PATCH] MYFACES-4450: render tabindex for outputLabel; update test --- .../renderkit/html/util/CommonHtmlAttributesUtil.java | 6 +----- .../myfaces/renderkit/html/HtmlLabelRendererTest.java | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java index ac8e7efdc3..3c0e324e75 100644 --- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java +++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/CommonHtmlAttributesUtil.java @@ -671,11 +671,7 @@ public static void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter return; } - if ((commonPropertiesMarked & CommonHtmlAttributes.ACCESSKEY) != 0) - { - HtmlRendererUtils.renderHTMLStringAttribute(writer, component, - HTML.ACCESSKEY_ATTR, HTML.ACCESSKEY_ATTR); - } + renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component); renderCommonPassthroughPropertiesWithoutEvents(writer, commonPropertiesMarked, component); } diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java index bd8bd1cf16..85b3155b2d 100644 --- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java +++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java @@ -93,6 +93,7 @@ public void testHtmlPropertyPassTru() throws Exception HtmlRenderedAttr[] attrs = { //_AccesskeyProperty new HtmlRenderedAttr("accesskey"), + new HtmlRenderedAttr("tabindex"), //_UniversalProperties new HtmlRenderedAttr("dir"), new HtmlRenderedAttr("lang"),