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 2017/09/07 14:17:56 UTC

svn commit: r1807608 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java

Author: lofwyr
Date: Thu Sep  7 14:17:56 2017
New Revision: 1807608

URL: http://svn.apache.org/viewvc?rev=1807608&view=rev
Log:
TOBAGO-1797: Disabled <tc:tab> should not contain a command

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java?rev=1807608&r1=1807607&r2=1807608&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java Thu Sep  7 14:17:56 2017
@@ -250,9 +250,11 @@ public class TabGroupRenderer extends Re
             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()) {