aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-28 13:33:31 -0800
committerJose Antonio Marquez2012-02-28 13:33:31 -0800
commit3a25881b3a463e4f695be2f663f141710ba1d1c1 (patch)
tree657d55ad394de168dd627cf89b875906d10584e2 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parentd764428023d87446fbbb153d8e04a23b900d71d5 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-3a25881b3a463e4f695be2f663f141710ba1d1c1.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--[-rwxr-xr-x]js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html112
1 files changed, 103 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 29bf6eb3..92adee05 100755..100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,9 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright>
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/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
2<html lang="en"> 7<html lang="en">
3 <head> 8 <head>
4 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
@@ -24,7 +29,10 @@
24 "trackRepetition" : {"@" : "repetition2"}, 29 "trackRepetition" : {"@" : "repetition2"},
25 "playhead": {"#": "playhead"}, 30 "playhead": {"#": "playhead"},
26 "playheadmarker": {"#": "playhead_marker"}, 31 "playheadmarker": {"#": "playhead_marker"},
27 "timetext" : {"#": "time_text"} 32 "timetext" : {"#": "time_text"},
33 "timebar" : {"#": "time_bar"},
34 "container_tracks" : {"#" : "container-tracks"},
35 "end_hottext" : {"@" : "endHottext"}
28 } 36 }
29 }, 37 },
30 38
@@ -107,6 +115,41 @@
107 "boundObject" : {"@" : "repetition1"}, 115 "boundObject" : {"@" : "repetition1"},
108 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", 116 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
109 "oneway" : false 117 "oneway" : false
118 },
119 "dtextPositionX" : {
120 "boundObject" : {"@" : "repetition1"},
121 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
122 "oneway" : false
123 },
124 "dtextPositionY" : {
125 "boundObject" : {"@" : "repetition1"},
126 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionY",
127 "oneway" : false
128 },
129 "dtextSkewX" : {
130 "boundObject" : {"@" : "repetition1"},
131 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewX",
132 "oneway" : false
133 },
134 "dtextSkewY" : {
135 "boundObject" : {"@" : "repetition1"},
136 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextSkewY",
137 "oneway" : false
138 },
139 "dtextScaleX" : {
140 "boundObject" : {"@" : "repetition1"},
141 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleX",
142 "oneway" : false
143 },
144 "dtextScaleY" : {
145 "boundObject" : {"@" : "repetition1"},
146 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextScaleY",
147 "oneway" : false
148 },
149 "dtextRotate" : {
150 "boundObject" : {"@" : "repetition1"},
151 "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextRotate",
152 "oneway" : false
110 } 153 }
111 } 154 }
112 }, 155 },
@@ -143,6 +186,36 @@
143 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens", 186 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
144 "oneway" : false 187 "oneway" : false
145 }, 188 },
189 "animatedElement" : {
190 "boundObject" : {"@" : "repetition2"},
191 "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement",
192 "oneway" : false
193 },
194 "arrStyleTracks" : {
195 "boundObject" : {"@" : "repetition2"},
196 "boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks",
197 "oneway" : false
198 },
199 "isTrackAnimated" : {
200 "boundObject" : {"@" : "repetition2"},
201 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated",
202 "oneway" : false
203 },
204 "trackDuration" : {
205 "boundObject" : {"@" : "repetition2"},
206 "boundObjectPropertyPath" : "objectAtCurrentIteration.trackDuration",
207 "oneway" : false
208 },
209 "animationName" : {
210 "boundObject" : {"@" : "repetition2"},
211 "boundObjectPropertyPath" : "objectAtCurrentIteration.animationName",
212 "oneway" : false
213 },
214 "currentKeyframeRule" : {
215 "boundObject" : {"@" : "repetition2"},
216 "boundObjectPropertyPath" : "objectAtCurrentIteration.currentKeyframeRule",
217 "oneway" : false
218 },
146 "isMainCollapsed" : { 219 "isMainCollapsed" : {
147 "boundObject" : {"@" : "repetition2"}, 220 "boundObject" : {"@" : "repetition2"},
148 "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", 221 "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
@@ -162,9 +235,26 @@
162 "boundObject" : {"@" : "repetition2"}, 235 "boundObject" : {"@" : "repetition2"},
163 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", 236 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
164 "oneway" : false 237 "oneway" : false
165 } 238 },
239 "trackPosition" : {
240 "boundObject" : {"@" : "repetition2"},
241 "boundObjectPropertyPath" : "objectAtCurrentIteration.trackPosition",
242 "oneway" : false
243 }
166 } 244 }
167 } 245 },
246 "endHottext" : {
247 "module": "js/components/hottextunit.reel",
248 "name": "HotTextUnit",
249 "properties": {
250 "element": {"#": "end_hottext"},
251 "maxValue" : 100000,
252 "minValue" : 1,
253 "acceptableUnits" : "sec",
254 "units" : "sec",
255 "value" : 25
256 }
257 }
168 } 258 }
169 </script> 259 </script>
170 260
@@ -193,7 +283,9 @@
193 283
194 284
195 <div id="user_layers" class="userlayers"> 285 <div id="user_layers" class="userlayers">
196 <div id="master_layer" class="masterlayer">Master Layer</div> 286 <div id="master_layer" class="masterlayer">
287 <div>Master Layer</div>
288 </div>
197 <div id="container-layers"> 289 <div id="container-layers">
198 <div id="container-layer"></div> 290 <div id="container-layer"></div>
199 </div> 291 </div>
@@ -202,25 +294,27 @@
202 <div id="timeline_gutter" class="timelinegutter"> 294 <div id="timeline_gutter" class="timelinegutter">
203 <div id="newlayer_button" class="newlayerbutton"></div> 295 <div id="newlayer_button" class="newlayerbutton"></div>
204 <div id="deletelayer_button" class="deletelayerbutton"></div> 296 <div id="deletelayer_button" class="deletelayerbutton"></div>
297 <input id="end_hottext" class="endhottext">
205 </div> 298 </div>
206 </div> 299 </div>
207 </div> 300 </div>
208 301
209 <div id="layer_resizer" class="layerresizer"></div> 302 <div data-montage-id="layer_resizer" class="layerresizer"></div>
210 303
211 <div id="timeline_rightpane" class="tl_rightpane"> 304 <div id="timeline_rightpane" class="tl_rightpane">
212 <div id="right_inside" class="rightinside"> 305 <div id="right_inside" class="rightinside">
213 <div class="layout_markers"> 306 <div class="layout_markers">
214 <div id="timeline_markers" class="timelinemarkers"> 307 <div id="playhead" class="playhead"></div>
215 <div id="playhead" class="playhead"></div> 308 <div id="timeline_markers" class="timelinemarkers"></div>
216 </div>
217 </div> 309 </div>
218 310
219 311
220 <div id="layer_tracks" class="tl_layertracks"> 312 <div id="layer_tracks" class="tl_layertracks">
221 <div class="layout-tracks"> 313 <div class="layout-tracks">
222 <div id="playhead_marker" class="playheadmarker"></div> 314 <div id="playhead_marker" class="playheadmarker"></div>