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/03/29 12:50:16 UTC
svn commit: r1789354 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer:
ButtonsRenderer.java SheetRenderer.java
Author: lofwyr
Date: Wed Mar 29 12:50:16 2017
New Revision: 1789354
URL: http://svn.apache.org/viewvc?rev=1789354&view=rev
Log:
TOBAGO-1729: Duplicate attribute in SheetRenderer and ButtonsRenderer
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java?rev=1789354&r1=1789353&r2=1789354&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java Wed Mar 29 12:50:16 2017
@@ -43,9 +43,13 @@ public class ButtonsRenderer extends Ren
writer.startElement(HtmlElements.DIV);
writer.writeIdAttribute(buttons.getClientId(facesContext));
- writer.writeClassAttribute(BootstrapClass.BTN_GROUP, BootstrapClass.NAVBAR_NAV);
- writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.GROUP.toString(), false);
- writer.writeClassAttribute(Classes.create(buttons), buttons.getCustomClass(), BootstrapClass.BTN_TOOLBAR);
+ writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.GROUP.toString(), false);
+ writer.writeClassAttribute(
+ Classes.create(buttons),
+ buttons.getCustomClass(),
+ BootstrapClass.BTN_TOOLBAR,
+ BootstrapClass.BTN_GROUP,
+ BootstrapClass.NAVBAR_NAV);
writer.writeStyleAttribute(buttons.getStyle());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, buttons);
final String tip = buttons.getTip();
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1789354&r1=1789353&r2=1789354&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Wed Mar 29 12:50:16 2017
@@ -763,8 +763,6 @@ public class SheetRenderer extends Rende
final Cell cell = grid.getCell(j - offset, i);
if (cell instanceof OriginCell) {
writer.startElement(HtmlElements.TH);
- writer.writeClassAttribute(column.getCustomClass());
- writer.writeStyleAttribute(column.getStyle());
if (cell.getColumnSpan() > 1) {
writer.writeAttribute(HtmlAttributes.COLSPAN, cell.getColumnSpan());
}
@@ -795,7 +793,8 @@ public class SheetRenderer extends Rende
} else {
align = null;
}
- writer.writeClassAttribute(Classes.create(sheet, "headerCell"), align);
+ writer.writeClassAttribute(Classes.create(sheet, "headerCell"), column.getCustomClass(), align);
+ writer.writeStyleAttribute(column.getStyle());
writer.startElement(HtmlElements.SPAN);
Icons sorterIcon = null;
Markup markup = Markup.NULL;