[myfaces-tobago] 02/02: TOBAGO-1826 Possibility to access the "markup"s via JavaScript * fix labelLayout="skip" for tc:in

[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

commit 42620eb9c7c753307e512ea9a0897517891b83f3
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Nov 24 11:25:24 2017 +0100

    TOBAGO-1826 Possibility to access the "markup"s via JavaScript
    * fix labelLayout="skip" for tc:in
---
 .../apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
index 7c67348..ea8c7ca 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
@@ -84,7 +84,6 @@ public class InRenderer extends MessageLayoutRendererBase {
       writer.startElement(HtmlElements.DIV); // Wrapping the field to fix input groups with flexLeft/flexRight
       if (input.isLabelLayoutSkip()) {
         writer.writeIdAttribute(clientId);
-        writer.writeAttribute(DataAttributes.MARKUP, JsonUtils.encode(markup), false);
       }
       writer.writeClassAttribute(TobagoClass.INPUT__GROUP__OUTER);
       writer.startElement(HtmlElements.DIV);
@@ -102,6 +101,9 @@ public class InRenderer extends MessageLayoutRendererBase {
     writer.writeAttribute(HtmlAttributes.TYPE, type);
     writer.writeNameAttribute(clientId);
     writer.writeIdAttribute(fieldId);
+    if (input.isLabelLayoutSkip()) {
+      writer.writeAttribute(DataAttributes.MARKUP, JsonUtils.encode(markup), false);
+    }
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, input);
     if (currentValue != null) {
       writer.writeAttribute(HtmlAttributes.VALUE, currentValue, true);

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.