aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html114
1 files changed, 35 insertions, 79 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
index 2d508b3c..0d7f517f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,23 +11,20 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/TimelineTrack.reel", 14 "prototype": "js/panels/Timeline/TimelineTrack.reel[Track]",
15 "name": "Track",
16 "properties": { 15 "properties": {
17 "element": {"#": "track"}, 16 "element": {"#": "track"},
18 "tweenRepetition" : {"@" : "tweenRepetition"}, 17 "tweenRepetition" : {"@" : "tweenRepetition"},
19 "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, 18 "track_lanes" : {"#" : "track_lanes"},
20 "tween": {"@" : "tween"}, 19 "tween": {"@" : "tween"},
21 "_mainCollapser" : {"@" : "mainCollapser"}, 20 "_mainCollapser" : {"@" : "mainCollapser"},
22 "_positionCollapser" : {"@" : "positionCollapser"}, 21 "_positionCollapser" : {"@" : "positionCollapser"},
23 "_transformCollapser" : {"@" : "transformCollapser"},
24 "_styleCollapser" : {"@" : "styleCollapser"} 22 "_styleCollapser" : {"@" : "styleCollapser"}
25 } 23 }
26 }, 24 },
27 25
28 "tween" : { 26 "tween" : {
29 "module" : "js/panels/timeline/Tween.reel", 27 "prototype" : "js/panels/timeline/Tween.reel",
30 "name" : "Tween",
31 "properties" : { 28 "properties" : {
32 "element":{"#": "track_lane"} 29 "element":{"#": "track_lane"}
33 }, 30 },
@@ -41,8 +38,7 @@
41 }, 38 },
42 39
43 "tweenRepetition": { 40 "tweenRepetition": {
44 "module": "montage/ui/repetition.reel", 41 "prototype": "montage/ui/repetition.reel",
45 "name": "Repetition",
46 "properties": { 42 "properties": {
47 "element": {"#": "track_lanes"}, 43 "element": {"#": "track_lanes"},
48 "isSelectionEnabled" : false 44 "isSelectionEnabled" : false
@@ -55,10 +51,8 @@
55 } 51 }
56 } 52 }
57 }, 53 },
58
59 "styleTrackRepetition": { 54 "styleTrackRepetition": {
60 "module": "montage/ui/repetition.reel", 55 "prototype": "montage/ui/repetition.reel",
61 "name": "Repetition",
62 "properties": { 56 "properties": {
63 "element": {"#": "content-styles"}, 57 "element": {"#": "content-styles"},
64 "isSelectionEnabled" : false 58 "isSelectionEnabled" : false
@@ -71,9 +65,21 @@
71 } 65 }
72 } 66 }
73 }, 67 },
68 "stylePropertyTrack" : {
69 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
70 "properties" : {
71 "element":{"#": "style-track-base"}
72 },
73 "bindings" : {
74 "propTrackData" : {
75 "boundObject" : {"@" : "styleTrackRepetition"},
76 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
77 "oneway" : false
78 }
79 }
80 },
74 "positionTracksRepetition": { 81 "positionTracksRepetition": {
75 "module": "montage/ui/repetition.reel", 82 "prototype": "montage/ui/repetition.reel",
76 "name": "Repetition",
77 "properties": { 83 "properties": {
78 "element": {"#": "content-position-tracks"}, 84 "element": {"#": "content-position-tracks"},
79 "isSelectionEnabled" : false 85 "isSelectionEnabled" : false
@@ -87,38 +93,21 @@
87 } 93 }
88 }, 94 },
89 "positionPropertyTrack" : { 95 "positionPropertyTrack" : {
90 "module" : "js/panels/Timeline/PropertyTrack.reel", 96 "prototype" : "js/panels/Timeline/PropertyTrack.reel",
91 "name" : "PropertyTrack",
92 "properties" : { 97 "properties" : {
93 "element":{"#": "position-track-base"} 98 "element":{"#": "position-track-base"}
94 } 99 },
95 }, 100 "bindings" : {
96 "transformTracksRepetition": { 101 "propTrackData" : {
97 "module": "montage/ui/repetition.reel", 102 "boundObject" : {"@" : "positionTracksRepetition"},
98 "name": "Repetition", 103 "boundObjectPropertyPath" : "objectAtCurrentIteration.propTrackData",
99 "properties": { 104 "oneway" : false
100 "element": {"#": "content-transform-tracks"}, 105 }
101 "isSelectionEnabled" : false 106 }
102 },
103 "bindings": {
104 "objects": {
105 "boundObject": {"@": "owner"},
106 "boundObjectPropertyPath": "arrTransformTracks",
107 "oneway": false
108 }
109 }
110 },
111 "transformPropertyTrack" : {
112 "module" : "js/panels/Timeline/PropertyTrack.reel",
113 "name" : "PropertyTrack",
114 "properties" : {
115 "element":{"#": "transform-track-base"}
116 }
117 }, 107 },
118 108
119 "mainCollapser" : { 109 "mainCollapser" : {
120 "module" : "js/panels/timeline/Collapser.js", 110 "prototype" : "js/panels/timeline/Collapser",
121 "name" : "Collapser",
122 "properties" : { 111 "properties" : {
123 "element" : {"#" : "content-main"}, 112 "element" : {"#" : "content-main"},
124 "myContent" : {"#":"content-main"}, 113 "myContent" : {"#":"content-main"},
@@ -143,8 +132,7 @@
143 }, 132 },
144 133
145 "positionCollapser" : { 134 "positionCollapser" : {
146 "module" : "js/panels/timeline/Collapser.js", 135 "prototype" : "js/panels/timeline/Collapser",
147 "name" : "Collapser",
148 "properties" : { 136 "properties" : {
149 "element" : {"#" : "content-position-tracks"}, 137 "element" : {"#" : "content-position-tracks"},
150 "myContent" : {"#":"content-position-tracks"}, 138 "myContent" : {"#":"content-position-tracks"},
@@ -168,35 +156,8 @@
168 } 156 }
169 }, 157 },
170 158
171 "transformCollapser" : {
172 "module" : "js/panels/timeline/Collapser.js",
173 "name" : "Collapser",
174 "properties" : {
175 "element" : {"#" : "content-transform-tracks"},
176 "myContent" : {"#":"content-transform-tracks"},
177 "contentHeight" : 40,
178 "isLabelClickable" : false,
179 "clicker" : {"#" : "label-transform"},
180 "isCollapsed" : true,
181 "isAnimated" : true
182 },
183 "bindings" : {
184 "isToggling" : {
185 "boundObject" : {"@" : "owner" },
186 "boundObjectPropertyPath" : "isTransformCollapsed",
187 "oneway" : false
188 },
189 "bypassAnimation" : {
190 "boundObject" : {"@": "owner"},
191 "boundObjectPropertyPath" : "bypassAnimation",
192 "oneway" : false
193 }