[myfaces-tobago] branch master updated: fix(tobago-out): make sure tobago-out is the outer tag

[hn...@apache.org]

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

hnoeth 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 5556ba1  fix(tobago-out): make sure tobago-out is the outer tag
5556ba1 is described below

commit 5556ba1d8e23b0d194d1967089dded545dff830b
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Mar 26 19:42:19 2021 +0100

    fix(tobago-out): make sure tobago-out is the outer tag
    
    The tobago-out html tag was wrapped inside a DIV. This is now switched.
---
 .../myfaces/tobago/internal/renderkit/renderer/OutRenderer.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
index 57d9405..cc7ffdb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
@@ -45,7 +45,7 @@ public class OutRenderer<T extends AbstractUIOut> extends MessageLayoutRendererB
 
   @Override
   public HtmlElements getComponentTag() {
-    return HtmlElements.DIV;
+    return HtmlElements.TOBAGO_OUT;
   }
 
   @Override
@@ -77,7 +77,7 @@ public class OutRenderer<T extends AbstractUIOut> extends MessageLayoutRendererB
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
     final Markup markup = component.getMarkup();
 
-    writer.startElement(HtmlElements.TOBAGO_OUT);
+    writer.startElement(isInside(facesContext, HtmlElements.TOBAGO_IN) ? HtmlElements.TOBAGO_OUT : HtmlElements.DIV);
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
 
     writer.writeClassAttribute(
@@ -131,7 +131,7 @@ public class OutRenderer<T extends AbstractUIOut> extends MessageLayoutRendererB
   @Override
   public void encodeEndField(final FacesContext facesContext, final T component) throws IOException {
     final TobagoResponseWriter writer = getResponseWriter(facesContext);
-    writer.endElement(HtmlElements.TOBAGO_OUT);
+    writer.endElement(isInside(facesContext, HtmlElements.TOBAGO_IN) ? HtmlElements.TOBAGO_OUT : HtmlElements.DIV);
   }
 
   @Override