Merge pull request #307 from volosied/MYFACES-4450-2.2

2.2.x: MYFACES-4450: render tabindex for outputLabel; update test
apache · Sep 6, 2022 · 746af1c · 746af1c
2 parents ba552ec + be27784
commit 746af1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
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
@@ -72,6 +72,7 @@ public void testHtmlPropertyPassTru() throws Exception
         HtmlRenderedAttr[] attrs = {
             //_AccesskeyProperty
             new HtmlRenderedAttr("accesskey"),
+            new HtmlRenderedAttr("tabindex"),
             //_UniversalProperties
             new HtmlRenderedAttr("dir"), 
             new HtmlRenderedAttr("lang"), 

diff --git a/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java b/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java
@@ -531,11 +531,7 @@ public static void renderLabelPassthroughPropertiesWithoutEvents(ResponseWriter
             long commonPropertiesMarked, UIComponent component) 
     throws IOException
     {
-        if ((commonPropertiesMarked & CommonPropertyConstants.ACCESSKEY_PROP) != 0)
-        {
-            HtmlRendererUtils.renderHTMLStringAttribute(writer, component,
-                    HTML.ACCESSKEY_ATTR, HTML.ACCESSKEY_ATTR);
-        }
+        renderAccesskeyTabindexProperties(writer, commonPropertiesMarked, component);
         renderCommonPassthroughPropertiesWithoutEvents(writer, commonPropertiesMarked, component);
     }