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 2011/11/18 15:16:08 UTC

svn commit: r1203654 - in /myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag: TreeMenuNodeRenderer.java TreeNodeRenderer.java

Author: lofwyr
Date: Fri Nov 18 14:16:08 2011
New Revision: 1203654

URL: http://svn.apache.org/viewvc?rev=1203654&view=rev
Log:
TOBAGO-377: Improved Tree
 - Fix: Root Node wasn't rendered after last change

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeMenuNodeRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java

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=1203654&r1=1203653&r2=1203654&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 Fri Nov 18 14:16:08 2011
@@ -138,7 +138,7 @@ public class TreeMenuNodeRenderer extend
       writer.writeClassAttribute(Classes.create(node));
       writer.writeAttribute(DataAttributes.TREEPARENT, parentId, false);
 
-      if (!tree.getExpandedCache().contains(parentId)) {
+      if (!root && !tree.getExpandedCache().contains(parentId)) {
         Style style = new Style();
         style.setDisplay(Display.NONE);
         writer.writeStyleAttribute(style);

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=1203654&r1=1203653&r2=1203654&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 Fri Nov 18 14:16:08 2011
@@ -162,7 +162,7 @@ public class TreeNodeRenderer extends La
       writer.writeClassAttribute(Classes.create(node));
       writer.writeAttribute(DataAttributes.TREEPARENT, parentId, false);
 
-      if (!tree.getExpandedCache().contains(parentId)) {
+      if (!root && !tree.getExpandedCache().contains(parentId)) {
         Style style = new Style();
         style.setDisplay(Display.NONE);
         writer.writeStyleAttribute(style);