aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
diff options
context:
space:
mode:
authorKruti Shah2012-07-20 11:38:57 -0700
committerKruti Shah2012-07-20 11:38:57 -0700
commit4436c04c81e0f372b7e03416a2515630de8c72c6 (patch)
treeedfbd366df9d7e7514425561a817fc2c67f398d9 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
parent5741fbc0a2eb1a43017b76406056bc98cdf00297 (diff)
parent936fbd6d76d35e3f9574983682c266de6dce55f7 (diff)
downloadninja-4436c04c81e0f372b7e03416a2515630de8c72c6.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html25
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 593b4ea1..8a4073c9 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
@@ -54,7 +54,6 @@ POSSIBILITY OF SUCH DAMAGE.
54 "playheadmarker": {"#": "playhead_marker"}, 54 "playheadmarker": {"#": "playhead_marker"},
55 "timetext" : {"#": "time_text"}, 55 "timetext" : {"#": "time_text"},
56 "timebar" : {"#": "time_bar"}, 56 "timebar" : {"#": "time_bar"},
57 "container_tracks" : {"#" : "container-tracks"},
58 "end_hottext" : {"@" : "endHottext"}, 57 "end_hottext" : {"@" : "endHottext"},
59 "container_layers" : {"#" : "container-layers"}, 58 "container_layers" : {"#" : "container-layers"},
60 "container_tracks" : {"#" : "container-tracks"}, 59 "container_tracks" : {"#" : "container-tracks"},
@@ -62,9 +61,23 @@ POSSIBILITY OF SUCH DAMAGE.
62 "checkable_animated" : {"#" : "checkable_animated"}, 61 "checkable_animated" : {"#" : "checkable_animated"},
63 "tl_configbutton" : {"#" : "tl-configbutton"}, 62 "tl_configbutton" : {"#" : "tl-configbutton"},
64 "checkable_lock" : {"#" : "checkable_lock"}, 63 "checkable_lock" : {"#" : "checkable_lock"},
65 "checkable_visible":{"#" : "checkable_visible"}, 64 "checkable_visible":{"#" : "checkable_visible"}
66 "play_button" : {"#" : "play_button"}, 65
67 "zoom_slider" : {"@" : "timelineZoomSlider"} 66 }
67 },
68
69 "playButton": {
70 "prototype": "montage/ui/toggle-button.reel",
71 "properties": {
72 "element": {"#": "play_button"},
73 "identifier": "playButton",
74 "pressedClass": "pausebutton",
75 "pressedLabel": "",
76 "unpressedLabel": "",
77 "pressed": false
78 },
79 "bindings": {
80 "pressed": {"<->": "@owner.stage.timelinePlay"}
68 } 81 }
69 }, 82 },
70 83
@@ -191,7 +204,7 @@ POSSIBILITY OF SUCH DAMAGE.
191 <div data-montage-id="leftpane_inside" class="leftinside"> 204 <div data-montage-id="leftpane_inside" class="leftinside">
192 <div data-montage-id="timeline_controller" class="timelinecontroller"> 205 <div data-montage-id="timeline_controller" class="timelinecontroller">
193 <div data-montage-id="timeline_controls" class="timelinecontrols"> 206 <div data-montage-id="timeline_controls" class="timelinecontrols">
194 <div data-montage-id="play_button" class="playbutton"></div> 207 <button data-montage-id="play_button" class="playbutton"></button>
195 <div data-montage-id="time_text" class="timetext">00:00:00</div> 208 <div data-montage-id="time_text" class="timetext">00:00:00</div>
196 </div> 209 </div>
197 </div> 210 </div>