[myfaces-tobago] branch master updated: Merged from trunk TOBAGO-1797: Disabled should not contain a command [from revision 1807608]

[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 fa90faf  Merged from trunk TOBAGO-1797: Disabled <tc:tab> should not contain a command [from revision 1807608]
fa90faf is described below

commit fa90faf42d2e2c66fe5fcf7724a507bf9deae112
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 7 14:18:44 2017 +0000

    Merged from trunk
    TOBAGO-1797: Disabled <tc:tab> should not contain a command [from revision 1807608]
---
 .../tobago/internal/renderkit/renderer/TabGroupRenderer.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
index 19cdc9f..d8e1de2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
@@ -250,9 +250,11 @@ public class TabGroupRenderer extends RendererBase implements ComponentSystemEve
             writer.writeAttribute(HtmlAttributes.TITLE, title, true);
           }
 
-          final CommandMap map = RenderUtils.getBehaviorCommands(facesContext, tab);
-          CommandMap.merge(map, tabGroupMap);
-          writer.writeAttribute(DataAttributes.COMMANDS, JsonUtils.encode(map), false);
+          if (!disabled) {
+            final CommandMap map = RenderUtils.getBehaviorCommands(facesContext, tab);
+            CommandMap.merge(map, tabGroupMap);
+            writer.writeAttribute(DataAttributes.COMMANDS, JsonUtils.encode(map), false);
+          }
 
           writer.startElement(HtmlElements.A);
           if (!tab.isDisabled()) {

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