aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /js/panels/Timeline/TimelinePanel.reel
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html291
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1114
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css274
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/pause.pngbin0 -> 1076 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play.pngbin0 -> 1190 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_next.pngbin0 -> 1185 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_prev.pngbin0 -> 1199 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/plus.pngbin0 -> 1133 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/timetick.jpgbin0 -> 737 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/trash.pngbin0 -> 1154 bytes
11 files changed, 1453 insertions, 232 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css
deleted file mode 100644
index 7f1b0f7f..00000000
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.css
+++ /dev/null
@@ -1,6 +0,0 @@
1/* <copyright>
2 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */
6
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 6849898b..0c302436 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -7,26 +7,289 @@
7<html lang="en"> 7<html lang="en">
8 <head> 8 <head>
9 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 9 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
10 <link rel="stylesheet" type="text/css" href="TimelinePanel.css"> 10 <link rel="stylesheet" type="text/css" href="css/TimelinePanel.css">
11
12
11 <script type="text/montage-serialization"> 13 <script type="text/montage-serialization">
12 { 14 {
13 "owner": { 15 "owner": {
14 "module": "js/panels/Timeline/TimelinePanel.reel", 16 "module": "js/panels/Timeline/TimelinePanel.reel",
15 "name": "TimelinePanel", 17 "name": "TimelinePanel",
16 "properties": { 18 "properties": {
17 "element": {"#": "timeline_panel"} 19 "element": {"#": "timeline_panel"},
18 } 20 "user_layers": {"#": "user_layers"},
19 } 21 "track_container": {"#": "right_inside"},
20 22 "timeline_leftpane" : {"#" : "timeline_leftpane"},
21 } 23 "layer_tracks": {"#": "layer_tracks"},
22 </script> 24 "master_track": {"#": "master_track"},
25 "newlayer_button": {"#": "newlayer_button"},
26 "deletelayer_button": {"#": "deletelayer_button"},
27 "time_markers" : {"#": "timeline_markers"},
28 "layerRepetition" : {"@": "repetition1"},
29 "trackRepetition" : {"@" : "repetition2"},
30 "playhead": {"#": "playhead"},
31 "playheadmarker": {"#": "playhead_marker"},
32 "timetext" : {"#": "time_text"},
33 "timebar" : {"#": "time_bar"},
34 "container_tracks" : {"#" : "container-tracks"},
35 "end_hottext" : {"@" : "endHottext"}
36 }
37 },
23 38
39 "timelineResize" : {
40 "module": "js/panels/Resizer",
41 "name": "Resizer",
42 "properties": {
43 "element": {"#": "layer_resizer"},
44 "panel" : {"#" : "timeline_leftpane"},
45 "isVertical" : false,
46 "isInversed" : false,
47 "isPanel" : false
48 }
49 },
50
51
52 "repetition1": {
53 "module": "montage/ui/repetition.reel",
54 "name": "Repetition",
55 "properties": {
56 "element": {"#": "container-layers"},
57 "isSelectionEnabled" : true
58 },
59 "bindings": {
60 "objects": {
61 "boundObject": {"@": "owner"},
62 "boundObjectPropertyPath": "arrLayers",
63 "oneway": false
64 }
65 }
66 },
67 "layer" : {
68 "module" : "js/panels/Timeline/Layer.reel",
69 "name" : "Layer",
70 "properties" : {
71 "element": {"#": "container-layer"}
72 },
73 "bindings" : {
74 "layerName" : {
75 "boundObject" : {"@" : "repetition1"},
76 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerName",
77 "oneway" : false
78 },
79 "layerID" : {
80 "boundObject" : {"@" : "repetition1"},
81 "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
82 "oneway" : false
83 },
84 "arrLayerStyles" : {
85 "boundObject" : {"@" : "repetition1"},
86 "boundObjectPropertyPath" : "objectAtCurrentIteration.arrLayerStyles",
87 "oneway" : false
88 },
89 "isMainCollapsed" : {
90 "boundObject" : {"@" : "repetition1"},
91 "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
92 "oneway" : false
93 },
94 "isPositionCollapsed" : {
95 "boundObject" : {"@" : "repetition1"},
96 "boundObjectPropertyPath" : "objectAtCurrentIteration.isPositionCollapsed",
97 "oneway" : false
98 },
99 "isTransformCollapsed" : {
100 "boundObject" : {"@" : "repetition1"},
101 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
102 "oneway" : false
103 },
104 "isSelected" : {
105 "boundObject" : {"@" : "repetition1"},
106 "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
107 "oneway" : false
108 },
109 "isActive" : {
110 "boundObject" : {"@" : "repetition1"},
111 "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
112 "oneway" : false
113 },
114 "isStyleCollapsed" : {
115 "boundObject" : {"@" : "repetition1"},
116 "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
117 "oneway" : false
118 }
119 }
120 },
121
122 "repetition2" : {
123 "module": "montage/ui/repetition.reel",
124 "name": "Repetition",
125 "properties": {
126 "element": {"#": "container-tracks"},
127 "isSelectionEnabled" : false
128 },
129 "bindings": {
130 "objects": {
131 "boundObject": {"@": "owner"},
132 "boundObjectPropertyPath": "arrTracks",
133 "oneway": false
134 }
135 }
136 },
137 "track" : {
138 "module" : "js/panels/Timeline/TimelineTrack.reel",
139 "name" : "TimelineTrack",
140 "properties" : {
141 "element": {"#": "container-track"}
142 },
143 "bindings" : {
144 "trackID" : {
145 "boundObject" : {"@" : "repetition2"},
146 "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
147 "oneway" : false
148 },
149 "tweens" : {
150 "boundObject" : {"@" : "repetition2"},
151 "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
152 "oneway" : false
153 },
154 "animatedElement" : {
155 "boundObject" : {"@" : "repetition2"},
156 "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement",
157 "oneway" : false
158 },
159 "arrStyleTracks" : {
160 "boundObject" : {"@" : "repetition2"},
161 "boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks",
162 "oneway" : false
163 },
164 "isTrackAnimated" : {
165 "boundObject" : {"@" : "repetition2"},
166 "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated",
167 "oneway" : false
168 },
169 "trackDuration" : {
170 "boundObject" : {"@" : "repetition2"},