diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/treeview | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/treeview')
-rw-r--r-- | js/components/treeview/tree-node.js | 4 | ||||
-rw-r--r-- | js/components/treeview/treeview.reel/treeview.js | 5 |
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 | ||