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 2012/08/01 13:13:48 UTC
svn commit: r1367921 [2/2] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/util/
tobago-example/tobago-example-demo/src/main/webapp/content/0...
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeLabelRenderer.java Wed Aug 1 11:13:46 2012
@@ -54,6 +54,7 @@ public class TreeLabelRenderer extends L
} else {
writer.startElement(HtmlElements.LABEL, label);
writer.writeClassAttribute(Classes.create(label));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
writer.writeStyleAttribute(createStyle(facesContext, label));
String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, label);
if (title != null) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeListboxRenderer.java Wed Aug 1 11:13:46 2012
@@ -80,6 +80,7 @@ public class TreeListboxRenderer extends
writer.startElement(HtmlElements.DIV, tree);
writer.writeClassAttribute(Classes.create(tree));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, tree);
writer.writeStyleAttribute(style);
writer.startElement(HtmlElements.INPUT, tree);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeMenuNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeMenuNodeRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeMenuNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeMenuNodeRenderer.java Wed Aug 1 11:13:46 2012
@@ -57,6 +57,7 @@ public class TreeMenuNodeRenderer extend
writer.startElement(HtmlElements.DIV, null);
writer.writeIdAttribute(clientId);
writer.writeClassAttribute(Classes.create(node));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, node);
if (parentId != null) {
writer.writeAttribute(DataAttributes.TREEPARENT, parentId, false);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Wed Aug 1 11:13:46 2012
@@ -69,6 +69,7 @@ public class TreeNodeRenderer extends Tr
HtmlRendererUtils.renderDojoDndItem(node, writer, true);
}
writer.writeClassAttribute(Classes.create(node));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, node);
if (parentId != null) {
writer.writeAttribute(DataAttributes.TREEPARENT, parentId, false);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeRenderer.java Wed Aug 1 11:13:46 2012
@@ -79,6 +79,7 @@ public class TreeRenderer extends Layout
Style style = new Style(facesContext, tree);
writer.writeStyleAttribute(style);
writer.writeIdAttribute(clientId);
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, tree);
final Selectable selectable = tree.getSelectableAsEnum();
if (selectable.isSupportedByTree()) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java Wed Aug 1 11:13:46 2012
@@ -83,6 +83,7 @@ public class TreeSelectRenderer extends
writer.startElement(HtmlElements.SPAN, null);
writer.writeClassAttribute(Classes.create(select));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
if (select.isShowCheckbox()
&& selectable != Selectable.NONE
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Wed Aug 1 11:13:46 2012
@@ -82,6 +82,7 @@ without shadow
HtmlRendererUtils.renderDojoDndItem(box, writer, true);
writer.writeClassAttribute(Classes.create(box));
writer.writeIdAttribute(clientId);
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, box);
writer.writeStyleAttribute(new Style(facesContext, box));
encodeBox(facesContext, writer, box);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.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/MediatorRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java Wed Aug 1 11:13:46 2012
@@ -40,6 +40,7 @@ public class MediatorRenderer extends La
UIMediator mediator = (UIMediator) component;
TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, mediator);
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, mediator);
writer.writeStyleAttribute(new Style(facesContext, mediator));
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.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/SeparatorRenderer.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Wed Aug 1 11:13:46 2012
@@ -55,6 +55,7 @@ public class SeparatorRenderer extends L
writer.startElement(HtmlElements.TABLE, component);
writer.writeIdAttribute(separator.getClientId(facesContext));
writer.writeClassAttribute(Classes.create(component));
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
Style style = new Style(facesContext, separator);
writer.writeStyleAttribute(style);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java?rev=1367921&r1=1367920&r2=1367921&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/HtmlRendererUtils.java Wed Aug 1 11:13:46 2012
@@ -47,6 +47,8 @@ import org.apache.myfaces.tobago.webapp.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.el.ELContext;
+import javax.el.ValueExpression;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
@@ -846,6 +848,28 @@ public final class HtmlRendererUtils {
FacesContextUtils.addMenuAcceleratorScript(facesContext, jsStatement);
}
+ public static void writeDataAttributes(
+ FacesContext context, TobagoResponseWriter writer, UIComponent component)
+ throws IOException {
+
+ final Map<Object, Object> dataAttributes = ComponentUtils.getDataAttributes(component);
+ if (dataAttributes == null) {
+ return;
+ }
+
+ final ELContext elContext = context.getELContext();
+
+ for (Map.Entry<Object, Object> entry : dataAttributes.entrySet()) {
+ final Object mapKey = entry.getKey();
+ final String name = mapKey instanceof ValueExpression
+ ? ((ValueExpression) mapKey).getValue(elContext).toString() : mapKey.toString();
+ final Object mapValue = entry.getValue();
+ final String value = mapValue instanceof ValueExpression
+ ? ((ValueExpression) mapValue).getValue(elContext).toString() : mapValue.toString();
+ writer.writeAttribute("data-" + name, value, true);
+ }
+ }
+
private static class Command {
private String actionId;
private Boolean transistion;