diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/treeview/treeview.reel/treeview.js | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/treeview/treeview.reel/treeview.js')
-rw-r--r-- | js/components/treeview/treeview.reel/treeview.js | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js index 9f78d36d..81dacbca 100644 --- a/js/components/treeview/treeview.reel/treeview.js +++ b/js/components/treeview/treeview.reel/treeview.js | |||
@@ -13,18 +13,43 @@ exports.Treeview = Montage.create(Component, { | |||
13 | data : { value : null }, | 13 | data : { value : null }, |
14 | rootBranch : { value : null }, | 14 | rootBranch : { value : null }, |
15 | 15 | ||
16 | activationEvent: { | ||
17 | value: null | ||
18 | // serializable: true | ||
19 | }, | ||
20 | |||
16 | _hasBeenDeserialized: { | 21 | _hasBeenDeserialized: { |
17 | value: false, | 22 | value: false |
18 | enumerable: false | 23 | // enumerable: false |
19 | }, | 24 | }, |
20 | 25 | ||
21 | branchComponent : { | 26 | branchComponent : { |
22 | value: null, | 27 | value: null |
23 | serializable: true | 28 | // serializable: true |
24 | }, | 29 | }, |
25 | leafComponent : { | 30 | leafComponent : { |
26 | value: null, | 31 | value: null |
27 | serializable: true | 32 | // serializable: true |
33 | }, | ||
34 | |||
35 | defaultBranchComponent: { | ||
36 | value: null | ||
37 | // serializable: true | ||
38 | }, | ||
39 | |||
40 | defaultLeafComponent: { | ||
41 | value: null | ||
42 | // serializable: true | ||
43 | }, | ||
44 | |||
45 | scrollview: { | ||
46 | value: null | ||
47 | // serializable: true | ||
48 | }, | ||
49 | |||
50 | slot: { | ||
51 | value: null | ||
52 | // serializable: true | ||
28 | }, | 53 | }, |
29 | 54 | ||
30 | hasTemplate: { | 55 | hasTemplate: { |
@@ -63,6 +88,7 @@ exports.Treeview = Montage.create(Component, { | |||
63 | }, | 88 | }, |
64 | showRoot : { | 89 | showRoot : { |
65 | value: null | 90 | value: null |
91 | // serializable: true | ||
66 | }, | 92 | }, |
67 | 93 | ||
68 | _contentController: { | 94 | _contentController: { |
@@ -110,6 +136,7 @@ exports.Treeview = Montage.create(Component, { | |||
110 | } | 136 | } |
111 | 137 | ||
112 | } | 138 | } |
139 | // serializable: true | ||
113 | }, | 140 | }, |
114 | 141 | ||
115 | deserializedFromTemplate: { | 142 | deserializedFromTemplate: { |