Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	js/io/system/ninjalibrary.json

2 files changed, 9 insertions, 0 deletions

diff --git a/js/components/treeview/tree-node.js b/js/components/treeview/tree-node.js
index d7b864b5..fa6e1ba4 100644
--- a/js/components/treeview/tree-node.js
+++ b/js/components/treeview/tree-node.js
@@ -52,6 +52,10 @@ exports.TreeNode = Montage.create(Component, {
                 }, this);
             }
             this._sourceObject = object;
+
+            if(this.handleSourceObjectSet) {
+                this.handleSourceObjectSet();
+            }
         }
     },
     childNodes : {
diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js
index ebbfe685..9f78d36d 100644
--- a/js/components/treeview/treeview.reel/treeview.js
+++ b/js/components/treeview/treeview.reel/treeview.js
@@ -11,6 +11,7 @@ exports.Treeview = Montage.create(Component, {
 
     substitution      : { value : null },
     data              : { value : null },
+    rootBranch        : { value : null },
 
     _hasBeenDeserialized: {
         value: false,
@@ -54,6 +55,8 @@ exports.Treeview = Montage.create(Component, {
             this.slot.content = rootBranch;
             rootBranch.sourceObject = this.contentController.root;
             rootBranch.needsDraw = true;
+            this.rootBranch = rootBranch;
+
             this.needsDraw = true;
 
         }
@@ -85,6 +88,8 @@ exports.Treeview = Montage.create(Component, {
 
             if (this._contentController) {
 
+//this._initializeRootBranch();
+
                 // And bind what we need from the new contentController
                 var selectedIndexesBindingDescriptor;