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/tree-node.js | |
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/tree-node.js')
-rw-r--r-- | js/components/treeview/tree-node.js | 4 |
1 files changed, 4 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 : { |