aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-13 13:05:33 -0700
committerNivesh Rajbhandari2012-03-13 13:05:33 -0700
commit92fc2e3c4bca2edb04102431b4959aafe022f329 (patch)
treed48c090f71ed2cd6bd6ce38ff68c36ab69299985 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parentefb92cf52680d31f05fed3757e74862592cc2d4c (diff)
parentf56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff)
downloadninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html169
1 files changed, 14 insertions, 155 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index ae1bcddf..14c5f1c8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,9 @@
32 "timetext" : {"#": "time_text"}, 32 "timetext" : {"#": "time_text"},
33 "timebar" : {"#": "time_bar"}, 33 "timebar" : {"#": "time_bar"},
34 "container_tracks" : {"#" : "container-tracks"}, 34 "container_tracks" : {"#" : "container-tracks"},
35 "end_hottext" : {"@" : "endHottext"} 35 "end_hottext" : {"@" : "endHottext"},
36 "container_layers" : {"#" : "container-layers"},
37 "timeline_disabler" : {"#" : "timeline-disabler"}
36 } 38 }
37 }, 39 },
38 40
@@ -71,91 +73,11 @@
71 "element": {"#": "container-layer"} 73 "element": {"#": "container-layer"}
72 }, 74 },
73 "bindings" : { 75 "bindings" : {
74 "layerName" : { 76 "layerData" : {
75 "boundObject" : {"@" : "repetition1"}, 77 "boundObject" : {"@" : "repetition1"},
76 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName", 78 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
77 "oneway" : false 79 "oneway" : false
78 }, 80 }
79 "layerID" : {
80 "boundObject" : {"@" : "repetition1"},
81 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
82 "oneway" : false
83 },
84 "arrLayerStyles" : {
85 "boundObject" : {"@" : "repetition1"},
86 "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles",
87 "oneway" : false
88 },
89 "isMainCollapsed" : {
90 "boundObject" : {"@" : "repetition1"},
91 "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
92 "oneway" : false
93 },
94 "isPositionCollapsed" : {
95 "boundObject" : {"@" : "repetition1"},
96 "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
97 "oneway" : false
98 },
99 "isTransformCollapsed" : {
100 "boundObject" : {"@" : "repetition1"},
101 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
102 "oneway" : false
103 },
104 "isSelected" : {
105 "boundObject" : {"@" : "repetition1"},
106 "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
107 "oneway" : false
108 },
109 "isActive" : {
110 "boundObject" : {"@" : "repetition1"},
111 "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
112 "oneway" : false
113 },
114 "isStyleCollapsed" : {
115 "boundObject" : {"@" : "repetition1"},
116 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
117 "oneway" : false
118 },
119 "bypassAnimation" : {
120 "boundObject" : {"@" : "repetition1"},
121 "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
122 "oneway" : false
123 },
124 "dtextPositionX" : {
125 "boundObject" : {"@" : "repetition1"},
126 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
127 "oneway" : false
128 },
129 "dtextPositionY" : {
130 "boundObject" : {"@" : "repetition1"},
131 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
132 "oneway" : false
133 },
134 "dtextSkewX" : {
135 "boundObject" : {"@" : "repetition1"},
136 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
137 "oneway" : false
138 },
139 "dtextSkewY" : {
140 "boundObject" : {"@" : "repetition1"},
141 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
142 "oneway" : false
143 },
144 "dtextScaleX" : {
145 "boundObject" : {"@" : "repetition1"},
146 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
147 "oneway" : false
148 },
149 "dtextScaleY" : {
150 "boundObject" : {"@" : "repetition1"},
151 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
152 "oneway" : false
153 },
154 "dtextRotate" : {
155 "boundObject" : {"@" : "repetition1"},
156 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
157 "oneway" : false
158 }
159 } 81 }
160 }, 82 },
161 83
@@ -181,76 +103,11 @@
181 "element": {"#": "container-track"} 103 "element": {"#": "container-track"}
182 }, 104 },
183 "bindings" : { 105 "bindings" : {
184 "trackID" : { 106 "trackData" : {
185 "boundObject" : {"@" : "repetition2"}, 107 "boundObject" : {"@" : "repetition2"},
186 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", 108 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerData",
187 "oneway" : false
188 },
189 "tweens" : {
190 "boundObject" : {"@" : "repetition2"},
191 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
192 "oneway" : false
193 },
194 "animatedElement" : {
195 "boundObject" : {"@" : "repetition2"},
196 "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement",
197 "oneway" : false
198 },
199 "arrStyleTracks" : {
200 "boundObject" : {"@" : "repetition2"},
201 "boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks",
202 "oneway" : false
203 },
204 "isTrackAnimated" : {
205 "boundObject" : {"@" : "repetition2"},
206 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated",
207 "oneway" : false
208 },
209 "trackDuration" : {
210 "boundObject" : {"@" : "repetition2"},
211 "boundObjectPropertyPath" : "objectAtCurrentIteration.trackDuration",
212 "oneway" : false
213 },
214 "animationName" : {
215 "boundObject" : {"@" : "repetition2"},
216 "boundObjectPropertyPath" : "objectAtCurrentIteration.animationName",
217 "oneway" : false
218 },
219 "currentKeyframeRule" : {
220 "boundObject" : {"@" : "repetition2"},
221 "boundObjectPropertyPath" : "objectAtCurrentIteration.currentKeyframeRule",
222 "oneway" : false
223 },
224 "isMainCollapsed" : {
225 "boundObject" : {"@" : "repetition2"},
226 "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
227 "oneway" : false
228 },
229 "isPositionCollapsed" : {
230 "boundObject" : {"@" : "repetition2"},
231 "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
232 "oneway" : false
233 },
234 "isTransformCollapsed" : {
235 "boundObject" : {"@" : "repetition2"},
236 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
237 "oneway" : false
238 },
239 "bypassAnimation" : {
240 "boundObject" : {"@" : "repetition2"},
241 "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
242 "oneway" : false
243 },
244 "isStyleCollapsed" : {
245 "boundObject" : {"@" : "repetition2"},
246 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
247 "oneway" : false
248 },
249 "trackPosition" : {
250