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 2016/05/19 12:56:16 UTC
svn commit: r1744565 -
/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
Author: lofwyr
Date: Thu May 19 12:56:15 2016
New Revision: 1744565
URL: http://svn.apache.org/viewvc?rev=1744565&view=rev
Log:
CSS classes of commands
Modified:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java?rev=1744565&r1=1744564&r2=1744565&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRendererBase.java Thu May 19 12:56:15 2016
@@ -22,7 +22,6 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.internal.component.AbstractUICommand;
import org.apache.myfaces.tobago.internal.component.AbstractUIForm;
-import org.apache.myfaces.tobago.internal.component.AbstractUIToolBar;
import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
import org.apache.myfaces.tobago.renderkit.RendererBase;
@@ -131,16 +130,6 @@ public abstract class CommandRendererBas
}
final boolean defaultCommand = ComponentUtils.getBooleanAttribute(command, Attributes.defaultCommand);
- // TODO this might be too expensive:
- // TODO please put a flag in the ToolBar-handler and Button-handler (facelets-handler)
- final boolean insideToolbar = ComponentUtils.findAncestor(command, AbstractUIToolBar.class) != null;
- writer.writeClassAttribute(
- Classes.create(command),
- BootstrapClass.BTN,
- defaultCommand ? BootstrapClass.BTN_PRIMARY : BootstrapClass.BTN_SECONDARY,
- insideToolbar ? BootstrapClass.NAVBAR_BTN : null,
- command.getCustomClass());
-
if (defaultCommand) {
final AbstractUIForm form = ComponentUtils.findAncestor(command, AbstractUIForm.class);
writer.writeAttribute(DataAttributes.DEFAULT, form.getClientId(facesContext), false);