From 23071f9cb32e1783d8c0aa960a8407e9024876c9 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 15 Feb 2012 21:51:28 -0800
Subject: Tree Node - fix for applying tree child nodes array twice (and
 getting duplicates)

---
 js/components/treeview/tree-node.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/components/treeview/tree-node.js b/js/components/treeview/tree-node.js
index 689fc233..d7b864b5 100644
--- a/js/components/treeview/tree-node.js
+++ b/js/components/treeview/tree-node.js
@@ -44,7 +44,9 @@ exports.TreeNode = Montage.create(Component, {
             if(!object) {
                 return;
             }
+
             if(object[this.branchKey]) {
+                this.childNodes.length = 0;
                 object[this.branchKey].forEach(function(node) {
                     this.childNodes.push(node);
                 }, this);
-- 
cgit v1.2.3


From e5654b593f0371ac218af2f542d4ab904dbca746 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 15 Feb 2012 21:51:58 -0800
Subject: Ninja Leaf/Branch - Minor CSS fixes

---
 js/components/treeview/ninja-branch.reel/ninja-branch.css | 2 +-
 js/components/treeview/ninja-leaf.reel/ninja-leaf.css     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index d8c212e8..a3a9350e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,7 @@
     cursor: pointer;
     font-weight: bold;
     padding: 3px 0 4px;
-    text-shadow: 1px 1px 0 #000;
+    text-shadow: 1px 1px 1px #000;
 }
 
 /* First Level */
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index 085b11e0..fedc1d9d 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -19,7 +19,6 @@
 /* Second level */
 .branch .branch .leaf-label {
     background-position: 25px center;
-    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
     color: #FFF;
     padding-left: 45px;
 }
-- 
cgit v1.2.3


From 8195f0c948f145b5883dd7298649ef24b7e941ae Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 15 Feb 2012 21:52:57 -0800
Subject: Tree view event delegate map fix

---
 js/components/treeview/ninja-leaf.reel/ninja-leaf.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index c6416693..1bfe66a4 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -63,7 +63,8 @@ exports.Leaf = Montage.create(TreeNode, {
             'dblclick'  : 'handleDblclick',
             'dragstart' : 'handleDragStart',
             'dragend'   : 'handleDragEnd'
-        }
+        },
+        distinct: true
     }
 
 
-- 
cgit v1.2.3


From 966f0adaf1d4b7f2dd5a6e31643df58bff713884 Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 15 Feb 2012 21:53:24 -0800
Subject: Tree controller - Minor change (to use "distinct" descriptor)

---
 js/components/controllers/tree-controller.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index 03ef7b9e..1e9222fd 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: 'children'
+        value: null
     },
 
     _root : {
@@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
    },
 
     branchControllers: {
-        value: []
+        value: [],
+        distinct: true
     },
 
     addBranchController : {
-- 
cgit v1.2.3