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 2018/04/26 09:42:33 UTC
[myfaces-tobago] branch master updated: TOBAGO-1894: ,
, , ,
should support customClass of
This is an automated email from the ASF dual-hosted git repository.
lofwyr 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 f30f08d TOBAGO-1894: <tc:treeIcon>, <tc:treeIndent>, <tc:treeNode>, <tc:treeCommand>, <tc:treeSelect> should support customClass of <tc:style>
f30f08d is described below
commit f30f08dd63538f51688a9a7d3f3478aba25e0477
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Apr 26 11:42:19 2018 +0200
TOBAGO-1894: <tc:treeIcon>, <tc:treeIndent>, <tc:treeNode>, <tc:treeCommand>, <tc:treeSelect> should support customClass of <tc:style>
---
.../tobago/internal/renderkit/renderer/TreeIconRenderer.java | 4 +++-
.../tobago/internal/renderkit/renderer/TreeIndentRenderer.java | 4 +++-
.../tobago/internal/renderkit/renderer/TreeLabelRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/TreeNodeRenderer.java | 3 ++-
.../tobago/internal/renderkit/renderer/TreeSelectRenderer.java | 3 ++-
.../org/apache/myfaces/tobago/example/demo/NavigationState.java | 8 ++++++--
.../webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml | 4 +++-
7 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
index 5ee3453..12ebeae 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIconRenderer.java
@@ -93,7 +93,9 @@ public class TreeIconRenderer extends RendererBase {
writer.startElement(HtmlElements.SPAN);
writer.writeIdAttribute(treeIcon.getClientId());
writer.writeAttribute(DataAttributes.MARKUP, JsonUtils.encode(treeIcon.getMarkup()), false);
- writer.writeClassAttribute(TobagoClass.TREE_NODE__TOGGLE);
+ writer.writeClassAttribute(
+ TobagoClass.TREE_NODE__TOGGLE,
+ treeIcon.getCustomClass());
if (StringUtils.startsWith(source, "fa-")) {
writer.startElement(HtmlElements.I);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
index 816865d..4b60e43 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeIndentRenderer.java
@@ -66,7 +66,9 @@ public class TreeIndentRenderer extends RendererBase {
writer.writeIdAttribute(treeIndent.getClientId(facesContext));
writer.writeAttribute(DataAttributes.MARKUP, JsonUtils.encode(treeIndent.getMarkup()), false);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, treeIndent);
- writer.writeClassAttribute(TobagoClass.TREE_NODE__TOGGLE);
+ writer.writeClassAttribute(
+ TobagoClass.TREE_NODE__TOGGLE,
+ treeIndent.getCustomClass());
// encode tree junction
if (!showJunctions || !showRootJunction && level == 0) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
index aed9e7c..0d829cc 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
@@ -57,7 +57,8 @@ public class TreeLabelRenderer extends RendererBase {
writer.startElement(HtmlElements.LABEL);
writer.writeClassAttribute(
TobagoClass.TREE_LABEL,
- TobagoClass.TREE_LABEL.createMarkup(label.getMarkup()));
+ TobagoClass.TREE_LABEL.createMarkup(label.getMarkup()),
+ label.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, label);
if (title != null) {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
index a6bca6d..71edec7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeNodeRenderer.java
@@ -152,7 +152,8 @@ public class TreeNodeRenderer extends RendererBase {
writer.writeClassAttribute(
TobagoClass.TREE_NODE,
TobagoClass.TREE_NODE.createMarkup(markup),
- hidden ? BootstrapClass.D_NONE : null);
+ hidden ? BootstrapClass.D_NONE : null,
+ node.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, node);
if (parentId != null) {
writer.writeAttribute(DataAttributes.TREE_PARENT, parentId, false);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
index b930d92..8eb88a9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
@@ -112,7 +112,8 @@ public class TreeSelectRenderer extends RendererBase {
writer.writeAttribute(DataAttributes.MARKUP, JsonUtils.encode(markup), false);
writer.writeClassAttribute(
TobagoClass.TREE_SELECT,
- TobagoClass.TREE_SELECT.createMarkup(markup));
+ TobagoClass.TREE_SELECT.createMarkup(markup),
+ treeSelect.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, treeSelect);
if (treeSelect.isShowCheckbox()
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
index 68029f4..9320c49 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationState.java
@@ -22,6 +22,7 @@ package org.apache.myfaces.tobago.example.demo;
import org.apache.deltaspike.core.api.scope.WindowScoped;
import org.apache.myfaces.tobago.model.ExpandedState;
import org.apache.myfaces.tobago.model.SelectedState;
+import org.apache.myfaces.tobago.model.TreePath;
import org.apache.myfaces.tobago.model.TreeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,9 +57,12 @@ public class NavigationState implements Serializable {
private void initState() {
if (currentNode != null) {
- state.getSelectedState().clearAndSelect(currentNode.getTreePath());
+ final TreePath treePath = currentNode.getTreePath();
+ state.getSelectedState().clearAndSelect(treePath);
+ if (!treePath.isRoot()) {
state.getExpandedState().collapseAllButRoot();
- state.getExpandedState().expand(currentNode.getTreePath(), true);
+ state.getExpandedState().expand(treePath, true);
+ }
}
}
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml
index 12d4e8a..db1c83b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/tree-menu.xhtml
@@ -42,7 +42,9 @@
<tc:tree value="#{treeController.sample}" var="node">
<tc:treeNode>
<tc:treeCommand label="#{node.userObject.name}"/>
- <tc:treeIndent/>
+ <tc:treeIndent showJunctions="true">
+ <tc:style customClass="float-right"/>
+ </tc:treeIndent>
</tc:treeNode>
</tc:tree>
</tc:section>
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.