4 files changed, 69 insertions, 13 deletions

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
index 60894fbc..8b808488 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.html
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -105,7 +105,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "properties": {
                 "element": { "#": "branchList" },
                 "contentController": {"@": "arrayController" },
-                "selectionEnabled": true
+                "isSelectionEnabled": true
             }
         },
 
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.js b/js/components/treeview/ninja-branch.reel/ninja-branch.js
index 0d1a1d0e..48271c2d 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.js
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.js
@@ -8,12 +8,41 @@ var Montage = require("montage").Montage,
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 var Branch = exports.Branch = Montage.create(TreeNode, {
-    hasTemplate:{
-        value:true
+    label: {
+        value: null,
+        serializable: true
+    },
+
+    branchList: {
+        value: null,
+        serializable: true
+    },
+
+    arrayController: {
+        value: null,
+        serializable: true
     },
+
     repetition:{
-        value: null
+        value: null,
+        serializable: true
     },
+
+    leafComponent: {
+        value: null,
+        serializable: true
+    },
+
+    branchComponent: {
+        value: null,
+        serializable: true
+    },
+
+    collapser: {
+        value: null,
+        serializable: true
+    },
+
     prepareForDraw : {
         value: function() {
             this.collapser.removeAttribute('id');
diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 1bed0f0b..9ab575c6 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "prototype" : "js/components/treeview/leaf.reel"                
             },
             "scrollview": {
-                "prototype": "montage/ui/scrollview.reel[Scrollview]",
+                "prototype": "montage/ui/scroller.reel",
                 "properties": {
                     "element": {"#": "treeView"},
                     "axis": "vertical"
diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js
index 9f78d36d..03e28c93 100644
--- a/js/components/treeview/treeview.reel/treeview.js
+++ b/js/components/treeview/treeview.reel/treeview.js
@@ -13,6 +13,11 @@ exports.Treeview = Montage.create(Component, {
     data              : { value : null },
     rootBranch        : { value : null },
 
+    activationEvent: {
+        value: null,
+        serializable: true
+    },
+
     _hasBeenDeserialized: {
         value: false,
         enumerable: false
@@ -27,6 +32,26 @@ exports.Treeview = Montage.create(Component, {
         serializable: true
     },
 
+    defaultBranchComponent: {
+        value: null,
+        serializable: true
+    },
+
+    defaultLeafComponent: {
+        value: null,
+        serializable: true
+    },
+
+    scrollview: {
+        value: null,
+        serializable: true
+    },
+
+    slot: {
+        value: null,
+        serializable: true
+    },
+
     hasTemplate: {
         value: true
     },
@@ -52,17 +77,18 @@ exports.Treeview = Montage.create(Component, {
             rootBranch.hideLabel = !this.showRoot;
             rootBranch.treeView = this;
 
-            this.slot.content = rootBranch;
-            rootBranch.sourceObject = this.contentController.root;
-            rootBranch.needsDraw = true;
-            this.rootBranch = rootBranch;
-
-            this.needsDraw = true;
+//            this.slot.content = rootBranch;
+//            rootBranch.sourceObject = this.contentController.root;
+//            rootBranch.needsDraw = true;
+//            this.rootBranch = rootBranch;
+//
+//            this.needsDraw = true;
 
         }
     },
     showRoot : {
-        value: null
+        value: null,
+        serializable: true
     },
 
     _contentController: {
@@ -109,7 +135,8 @@ exports.Treeview = Montage.create(Component, {
                 }
             }
 
-        }
+        },
+        serializable: true
     },
 
     deserializedFromTemplate: {