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/09/06 19:16:43 UTC

[myfaces] branch 2.2.x updated: MYFACES-4450: render tabindex for outputLabel; update test

This is an automated email from the ASF dual-hosted git repository.

volosied pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/2.2.x by this push:
     new be277843c MYFACES-4450: render tabindex for outputLabel; update test
     new 746af1cdc Merge pull request #307 from volosied/MYFACES-4450-2.2
be277843c is described below

commit be277843cd71fdd189f92a8ebf8157117262f9dc
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Fri Sep 2 09:56:47 2022 -0400

    MYFACES-4450: render tabindex for outputLabel; update test
---
 .../org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java    | 1 +
 .../apache/myfaces/shared/renderkit/html/CommonPropertyUtils.java   | 6 +-----
 2 files changed, 2 insertions(+), 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
index c54b78ae1..a1e66e0d8 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
@@ -72,6 +72,7 @@ public class HtmlLabelRendererTest extends AbstractJsfTestCase
         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
index f1b35c8c8..46e42c9f1 100644
--- 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 final class CommonPropertyUtils
             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);
     }