From 4d1f1d02e9e443485357c482432938fd0d9f757d Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 23 Feb 2012 07:57:17 -0800 Subject: Redo timeline resize code Signed-off-by: Jonathan Duran --- .../Timeline/TimelinePanel.reel/TimelinePanel.html | 25 ++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html') 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 @@ "playhead": {"#": "playhead"}, "playheadmarker": {"#": "playhead_marker"}, "timetext" : {"#": "time_text"}, - "timebar" : {"#": "time_bar"} + "timebar" : {"#": "time_bar"}, + "container_tracks" : {"#" : "container-tracks"}, + "end_hottext" : {"@" : "endHottext"} } }, @@ -200,7 +202,19 @@ "oneway" : false } } - } + }, + "endHottext" : { + "module": "js/components/hottextunit.reel", + "name": "HotTextUnit", + "properties": { + "element": {"#": "end_hottext"}, + "maxValue" : 100000, + "minValue" : 1, + "acceptableUnits" : "sec", + "units" : "sec", + "value" : 25 + } + } } @@ -240,7 +254,7 @@
- +
@@ -250,9 +264,8 @@
-
-
-
+
+
-- cgit v1.2.3