From d8e1dea8f57b567b45aadb2faff6859e5f06c4dc Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 10 Nov 2006 23:00:04 +0000
Subject: [PATCH] Monotone-Parent: 69f4dab4873454f7a95f8824f9f72c5a71f8d3d7
 Monotone-Revision: a3b7b268652223f09bb5a43b037710e48aed6f1e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-10T23:00:04
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/MailerUI/UIxMailTree.wox        | 4 ++--
 UI/Templates/MailerUI/UIxMailTreeBlockJS.wox | 2 +-
 UI/WebServerResources/dtree.js               | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailTree.wox b/UI/Templates/MailerUI/UIxMailTree.wox
index b15cdc170..250e87f8b 100644
--- a/UI/Templates/MailerUI/UIxMailTree.wox
+++ b/UI/Templates/MailerUI/UIxMailTree.wox
@@ -36,7 +36,7 @@
           /></var:foreach>
       document.write(d);
     </script>
-    <noscript>
+<!--    <noscript>
       <var:treeview
 	list="rootNodes" item="item" sublist="item.children"
 	zoom="item.isPathNode"
@@ -68,5 +68,5 @@
               ></a
             ></var:tree-data>
       </var:treeview>
-    </noscript>
+    </noscript> -->
   </div>
diff --git a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
index 7a23fd307..0ffd12900 100644
--- a/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
+++ b/UI/Templates/MailerUI/UIxMailTreeBlockJS.wox
@@ -3,5 +3,5 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:var="http://www.skyrix.com/od/binding"
     xmlns:const="http://www.skyrix.com/od/constant"
-    ><var:string value="treeObjectName" />.add(<var:string value="item.serial" />, <var:string value="item.parent" />, '<var:string value="item.title" />', '#', 'onMailboxTreeItemClick(this);', '<var:string value="item.name" />', '<var:string value="item.folderType" />', '', '', '<var:string value="iconName" />', '<var:string value="iconName" />');
+    ><var:string value="treeObjectName" />.add(<var:string value="item.serial" />, <var:string value="item.parent" />, '<var:string value="item.title" />', <var:string value="item.hasChildren" />, '#', 'onMailboxTreeItemClick(this);', '<var:string value="item.name" />', '<var:string value="item.folderType" />', '', '', '<var:string value="iconName" />', '<var:string value="iconName" />');
   </container>
diff --git a/UI/WebServerResources/dtree.js b/UI/WebServerResources/dtree.js
index 891465d9a..5ce6e96b4 100644
--- a/UI/WebServerResources/dtree.js
+++ b/UI/WebServerResources/dtree.js
@@ -10,9 +10,9 @@
   |--------------------------------------------------*/
 
 // Node object
-function Node(id, pid, name, url, onclick, dataname, datatype, title, target,
+function Node(id, pid, name, isParent, url, onclick, dataname, datatype, title, target,
               icon, iconOpen, open) {
-  this.isParent = false;
+  this.isParent = isParent;
   this.id = id;
   this.pid = pid;
   this.name = name;
@@ -72,9 +72,9 @@ function dTree(objName) {
 };
 
 // Adds a new node to the node array
-dTree.prototype.add = function(id, pid, name, url, onclick, datatype,
+dTree.prototype.add = function(id, pid, name, isParent, url, onclick, datatype,
                                title, target, icon, iconOpen, open) {
-  this.aNodes[this.aNodes.length] = new Node(id, pid, name, url, onclick,
+  this.aNodes[this.aNodes.length] = new Node(id, pid, name, isParent, url, onclick,
                                              datatype, title, target, icon,
                                              iconOpen, open);
 };
@@ -105,7 +105,6 @@ dTree.prototype.toString = function() {
 dTree.prototype.addNode = function(pNode) {
   var str = '';
   var n=0;
-  pNode.isParent = true;
   if (this.config.inOrder) n = pNode._ai;
   for (n; n<this.aNodes.length; n++) {
     if (this.aNodes[n].pid == pNode.id) {