From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 13:30:49 -0800 Subject: merge new timeline Signed-off-by: Jonathan Duran --- .../Timeline/TimelinePanel.reel/TimelinePanel.html | 230 +++++++++++++++++++-- 1 file changed, 211 insertions(+), 19 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 6849898b..35f348c7 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html @@ -1,32 +1,224 @@ - - + + + + { + "owner": { + "module": "js/panels/Timeline/TimelinePanel.reel", + "name": "TimelinePanel", + "properties": { + "element": {"#": "timeline_panel"}, + "user_layers": {"#": "user_layers"}, + "track_container": {"#": "right_inside"}, + "layer_tracks": {"#": "layer_tracks"}, + "master_track": {"#": "master_track"}, + "newlayer_button": {"#": "newlayer_button"}, + "deletelayer_button": {"#": "deletelayer_button"}, + "time_markers" : {"#": "timeline_markers"}, + "layerRepetition" : {"@": "repetition1"}, + "trackRepetition" : {"@" : "repetition2"}, + "playhead": {"#": "playhead"}, + "playheadmarker": {"#": "playhead_marker"}, + "timetext" : {"#": "time_text"} + } + }, + "timelineResize" : { + "module": "js/panels/Resizer", + "name": "Resizer", + "properties": { + "element": {"#": "layer_resizer"}, + "panel" : {"#" : "timeline_leftpane"}, + "isVertical" : false, + "isInversed" : false + } + }, + + + "repetition1": { + "module": "montage/ui/repetition.reel", + "name": "Repetition", + "properties": { + "element": {"#": "container-layers"}, + "isSelectionEnabled" : true + }, + "bindings": { + "objects": { + "boundObject": {"@": "owner"}, + "boundObjectPropertyPath": "arrLayers", + "oneway": false + } + } + }, + "layer" : { + "module" : "js/panels/Timeline/Layer.reel", + "name" : "Layer", + "properties" : { + "element": {"#": "container-layer"} + }, + "bindings" : { + "layerName" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName", + "oneway" : false + }, + "layerID" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID", + "oneway" : false + }, + "arrLayerStyles" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles", + "oneway" : false + }, + "isMainCollapsed" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", + "oneway" : false + }, + "isPositionCollapsed" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", + "oneway" : false + }, + "isTransformCollapsed" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", + "oneway" : false + }, + "isStyleCollapsed" : { + "boundObject" : {"@" : "repetition1"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", + "oneway" : false + } + } + }, + + "repetition2" : { + "module": "montage/ui/repetition.reel", + "name": "Repetition", + "properties": { + "element": {"#": "container-tracks"}, + "isSelectionEnabled" : false + }, + "bindings": { + "objects": { + "boundObject": {"@": "owner"}, + "boundObjectPropertyPath": "arrTracks", + "oneway": false + } + } + }, + "track" : { + "module" : "js/panels/Timeline/TimelineTrack.reel", + "name" : "TimelineTrack", + "properties" : { + "element": {"#": "container-track"} + }, + "bindings" : { + "trackID" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID", + "oneway" : false + }, + "tweens" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens", + "oneway" : false + }, + "isMainCollapsed" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed", + "oneway" : false + }, + "isPositionCollapsed" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed", + "oneway" : false + }, + "isTransformCollapsed" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed", + "oneway" : false + }, + "isStyleCollapsed" : { + "boundObject" : {"@" : "repetition2"}, + "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed", + "oneway" : false + } + } + } + } + -
- +
+ + + +
+ + +
+
+
+
+
+
+
+
+
00:00:00
+
+
+ + + +
+
Master Layer
+
+
+
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+ +
-- cgit v1.2.3