Changeset 4847 for branches/2.11-stable

Timestamp:

Mar 26, 2009, 9:07:28 AM (14 years ago)

Author:

Martin Svensson

Message:

References #1240. Do not use lazy-icons in the item-tree when a node's children are already loaded.

File:

• branches/2.11-stable/www/common/overview/tree.jsp (modified) (1 diff)

branches/2.11-stable/www/common/overview/tree.jsp

@@ -111 +111 @@
     int numChildren = child.getChildren() == null ? 
       0 : child.getChildren().size();
-    sb.append("var node").append(child.hashCode()).append(" = JoustMenu.addLazyChildItem(").append("node"+startNode.hashCode());
-    sb.append(",'").append(folderIcon).append("'");
-    sb.append(",'").append(HTML.javaScriptEncode(child.getTitle()));
-    sb.append(child.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "").append("',");
-    sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("',");
-    sb.append("'lazyInitSubNode(\"").append(child.getId()).append("\")')\n");
+    if (!child.isChildrenLoaded())
+    {
+      sb.append("var node").append(child.hashCode()).append(" = JoustMenu.addLazyChildItem(").append("node"+startNode.hashCode());
+      sb.append(",'").append(folderIcon).append("'");
+      sb.append(",'").append(HTML.javaScriptEncode(child.getTitle()));
+      sb.append(child.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "").append("',");
+      sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("',");
+      sb.append("'lazyInitSubNode(\"").append(child.getId()).append("\")')\n");
+    }
+    else
+    {
+       sb.append("var node").append(child.hashCode()).append(" = JoustMenu.addChildItem(").append("node"+startNode.hashCode());
+             sb.append(",'").append(folderIcon).append("'");
+             sb.append(",'").append(HTML.javaScriptEncode(child.getTitle()));
+             sb.append(child.getNodeType() == Node.Type.FOLDER ? " (" + numChildren + ")" : "").append("',");
+             sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("')\n");
+    }
     sb.append(generateSubTree(child, ID, showFailures));
   }