diff options
author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/components/treeview/treeview.reel | |
parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/treeview/treeview.reel')
-rw-r--r-- | js/components/treeview/treeview.reel/treeview.js | 5 |
1 files changed, 5 insertions, 0 deletions
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 | ||