aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-23 14:34:58 -0700
committerArmen Kesablyan2012-05-23 14:34:58 -0700
commitc21db7f1e4a0582777bdb5366df5d023a915b779 (patch)
treec4d29cb4686101d4a480ae836d20187879cf5400 /js/components/treeview
parent3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff)
parent1a7e347810401e6262d9d7bad1c3583e6773993b (diff)
downloadninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/treeview')
-rw-r--r--js/components/treeview/tree-node.js4
-rw-r--r--js/components/treeview/treeview.reel/treeview.js5
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, {
52 }, this); 52 }, this);
53 } 53 }
54 this._sourceObject = object; 54 this._sourceObject = object;
55
56 if(this.handleSourceObjectSet) {
57 this.handleSourceObjectSet();
58 }
55 } 59 }
56 }, 60 },
57 childNodes : { 61 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, {
11 11
12 substitution : { value : null }, 12 substitution : { value : null },
13 data : { value : null }, 13 data : { value : null },
14 rootBranch : { value : null },
14 15
15 _hasBeenDeserialized: { 16 _hasBeenDeserialized: {
16 value: false, 17 value: false,
@@ -54,6 +55,8 @@ exports.Treeview = Montage.create(Component, {
54 this.slot.content = rootBranch; 55 this.slot.content = rootBranch;
55 rootBranch.sourceObject = this.contentController.root; 56 rootBranch.sourceObject = this.contentController.root;
56 rootBranch.needsDraw = true; 57 rootBranch.needsDraw = true;
58 this.rootBranch = rootBranch;
59
57 this.needsDraw = true; 60 this.needsDraw = true;
58 61
59 } 62 }
@@ -85,6 +88,8 @@ exports.Treeview = Montage.create(Component, {
85 88
86 if (this._contentController) { 89 if (this._contentController) {
87 90
91//this._initializeRootBranch();
92
88 // And bind what we need from the new contentController 93 // And bind what we need from the new contentController
89 var selectedIndexesBindingDescriptor; 94 var selectedIndexesBindingDescriptor;
90 95