diff options
author | Jonathan Duran | 2012-02-23 07:57:17 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-23 07:57:17 -0800 |
commit | 4d1f1d02e9e443485357c482432938fd0d9f757d (patch) | |
tree | 12932477cf21de913bebd381915261a923f49f9c /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |
parent | b7402018659cf8058d5646c08b2a916492269e33 (diff) | |
download | ninja-4d1f1d02e9e443485357c482432938fd0d9f757d.tar.gz |
Redo timeline resize code
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index 2a84c21a..33145028 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | |||
@@ -25,7 +25,9 @@ | |||
25 | "playhead": {"#": "playhead"}, | 25 | "playhead": {"#": "playhead"}, |
26 | "playheadmarker": {"#": "playhead_marker"}, | 26 | "playheadmarker": {"#": "playhead_marker"}, |
27 | "timetext" : {"#": "time_text"}, | 27 | "timetext" : {"#": "time_text"}, |
28 | "timebar" : {"#": "time_bar"} | 28 | "timebar" : {"#": "time_bar"}, |
29 | "container_tracks" : {"#" : "container-tracks"}, | ||
30 | "end_hottext" : {"@" : "endHottext"} | ||
29 | } | 31 | } |
30 | }, | 32 | }, |
31 | 33 | ||
@@ -200,7 +202,19 @@ | |||
200 | "oneway" : false | 202 | "oneway" : false |
201 | } | 203 | } |
202 | } | 204 | } |
203 | } | 205 | }, |
206 | "endHottext" : { | ||
207 | "module": "js/components/hottextunit.reel", | ||
208 | "name": "HotTextUnit", | ||
209 | "properties": { | ||
210 | "element": {"#": "end_hottext"}, | ||
211 | "maxValue" : 100000, | ||
212 | "minValue" : 1, | ||
213 | "acceptableUnits" : "sec", | ||
214 | "units" : "sec", | ||
215 | "value" : 25 | ||
216 | } | ||
217 | } | ||
204 | } | 218 | } |
205 | </script> | 219 | </script> |
206 | 220 | ||
@@ -240,7 +254,7 @@ | |||
240 | <div id="timeline_gutter" class="timelinegutter"> | 254 | <div id="timeline_gutter" class="timelinegutter"> |
241 | <div id="newlayer_button" class="newlayerbutton"></div> | 255 | <div id="newlayer_button" class="newlayerbutton"></div> |
242 | <div id="deletelayer_button" class="deletelayerbutton"></div> | 256 | <div id="deletelayer_button" class="deletelayerbutton"></div> |
243 | <input id="end_hottext" class="endhottext hottext"> | 257 | <input id="end_hottext" class="endhottext"> |
244 | </div> | 258 | </div> |
245 | </div> | 259 | </div> |
246 | </div> | 260 | </div> |
@@ -250,9 +264,8 @@ | |||
250 | <div id="timeline_rightpane" class="tl_rightpane"> | 264 | <div id="timeline_rightpane" class="tl_rightpane"> |
251 | <div id="right_inside" class="rightinside"> | 265 | <div id="right_inside" class="rightinside"> |
252 | <div class="layout_markers"> | 266 | <div class="layout_markers"> |
253 | <div id="timeline_markers" class="timelinemarkers"> | 267 | <div id="playhead" class="playhead"></div> |
254 | <div id="playhead" class="playhead"></div> | 268 | <div id="timeline_markers" class="timelinemarkers"></div> |
255 | </div> | ||
256 | </div> | 269 | </div> |
257 | 270 | ||
258 | 271 | ||