You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/01/29 10:39:59 UTC

[myfaces-tobago] branch master updated: Use tobago-dropdown only for parents of commands, not for "normal" links

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

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new f59a1fd  Use tobago-dropdown only for parents of commands, not for "normal" links
f59a1fd is described below

commit f59a1fdbfaecc8ba3ace95f014c37e877f1534f0
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jan 29 11:39:48 2020 +0100

    Use tobago-dropdown only for parents of commands, not for "normal" links
    
    TOBAGO-1633: TS refactoring
---
 .../internal/renderkit/renderer/LinkInsideLinksRenderer.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java
index 0345145..c816c55 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LinkInsideLinksRenderer.java
@@ -37,8 +37,9 @@ public class LinkInsideLinksRenderer extends LinkRenderer {
 
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
 
-    writer.startElement(HtmlElements.TOBAGO_DROPDOWN);
+    writer.startElement(HtmlElements.LI);
     if (parentOfCommands) {
+      writer.startElement(HtmlElements.TOBAGO_DROPDOWN);
       writer.writeIdAttribute(clientId);
     }
 
@@ -49,8 +50,14 @@ public class LinkInsideLinksRenderer extends LinkRenderer {
 
   @Override
   protected void encodeEndOuter(final FacesContext facesContext, final AbstractUICommand command) throws IOException {
+    final boolean parentOfCommands = command.isParentOfCommands();
+
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
-    writer.endElement(HtmlElements.TOBAGO_DROPDOWN);
+
+    if (parentOfCommands) {
+      writer.endElement(HtmlElements.TOBAGO_DROPDOWN);
+    }
+    writer.endElement(HtmlElements.LI);
   }
 
   @Override