aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/panels/Timeline
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html5
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html47
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html5
-rw-r--r--js/panels/Timeline/Span.reel/Span.html5
-rw-r--r--js/panels/Timeline/Style.reel/Style.html14
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html23
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html38
-rw-r--r--js/panels/Timeline/Track.reel/Track.html11
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html11
10 files changed, 58 insertions, 106 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 7e917b5a..6f9a6d05 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Keyframe.reel", 14 "prototype": "js/panels/Timeline/Keyframe.reel",
15 "name": "Keyframe",
16 "properties": { 15 "properties": {
17 "element": {"#": "keyframespace"} 16 "element": {"#": "keyframespace"}
18 } 17 }
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index 79b522ee..25827f72 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "owner": { 13 "owner": {
14 "module": "js/panels/Timeline/Layer.reel", 14 "prototype": "js/panels/Timeline/Layer.reel",
15 "name": "Layer",
16 "properties": { 15 "properties": {
17 "element": {"#": "layer"}, 16 "element": {"#": "layer"},
18 "styleRepetition" : {"@":"repetition1"}, 17 "styleRepetition" : {"@":"repetition1"},
@@ -26,8 +25,7 @@
26 } 25 }
27 }, 26 },
28 "dtext1" : { 27 "dtext1" : {
29 "module" : "montage/ui/dynamic-text.reel", 28 "prototype" : "montage/ui/dynamic-text.reel",
30 "name" : "DynamicText",
31 "properties" : { 29 "properties" : {
32 "element" : {"#" : "layer-label-text"} 30 "element" : {"#" : "layer-label-text"}
33 }, 31 },
@@ -40,8 +38,7 @@
40 } 38 }
41 }, 39 },
42 "repetition1": { 40 "repetition1": {
43 "module": "montage/ui/repetition.reel", 41 "prototype": "montage/ui/repetition.reel",
44 "name": "Repetition",
45 "properties": { 42 "properties": {
46 "element": {"#": "style-container"}, 43 "element": {"#": "style-container"},
47 "isSelectionEnabled" : true 44 "isSelectionEnabled" : true
@@ -55,8 +52,7 @@
55 } 52 }
56 }, 53 },
57 "style" : { 54 "style" : {
58 "module" : "js/panels/Timeline/Style.reel", 55 "prototype" : "js/panels/Timeline/Style.reel[LayerStyle]",
59 "name" : "LayerStyle",
60 "properties" : { 56 "properties" : {
61 "element" : {"#" : "layer-style"} 57 "element" : {"#" : "layer-style"}
62 }, 58 },
@@ -99,8 +95,7 @@
99 } 95 }
100 }, 96 },
101 "dtext_position_x" : { 97 "dtext_position_x" : {
102 "module": "js/components/hottextunit.reel", 98 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
103 "name": "HotTextUnit",
104 "properties": { 99 "properties": {
105 "element": {"#": "position-x"}, 100 "element": {"#": "position-x"},
106 "maxValue" : 100000, 101 "maxValue" : 100000,
@@ -118,8 +113,7 @@
118 } 113 }
119 }, 114 },
120 "dtext_position_y" : { 115 "dtext_position_y" : {
121 "module": "js/components/hottextunit.reel", 116 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
122 "name": "HotTextUnit",
123 "properties": { 117 "properties": {
124 "element": {"#": "position-y"}, 118 "element": {"#": "position-y"},
125 "maxValue" : 100000, 119 "maxValue" : 100000,
@@ -137,8 +131,7 @@
137 } 131 }
138 }, 132 },
139 "dtext_scale_x" : { 133 "dtext_scale_x" : {
140 "module": "js/components/hottextunit.reel", 134 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
141 "name": "HotTextUnit",
142 "properties": { 135 "properties": {
143 "element": {"#": "scale-x"}, 136 "element": {"#": "scale-x"},
144 "maxValue" : 100, 137 "maxValue" : 100,
@@ -156,8 +149,7 @@
156 } 149 }
157 }, 150 },
158 "dtext_scale_y" : { 151 "dtext_scale_y" : {
159 "module": "js/components/hottextunit.reel", 152 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
160 "name": "HotTextUnit",
161 "properties": { 153 "properties": {
162 "element": {"#": "scale-y"}, 154 "element": {"#": "scale-y"},
163 "maxValue" : 100, 155 "maxValue" : 100,
@@ -175,8 +167,7 @@
175 } 167 }
176 }, 168 },
177 "dtext_skew_x" : { 169 "dtext_skew_x" : {
178 "module": "js/components/hottextunit.reel", 170 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
179 "name": "HotTextUnit",
180 "properties": { 171 "properties": {
181 "element": {"#": "skew-x"}, 172 "element": {"#": "skew-x"},
182 "maxValue" : 100, 173 "maxValue" : 100,
@@ -194,8 +185,7 @@
194 } 185 }
195 }, 186 },
196 "dtext_skew_y" : { 187 "dtext_skew_y" : {
197 "module": "js/components/hottextunit.reel", 188 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
198 "name": "HotTextUnit",
199 "properties": { 189 "properties": {
200 "element": {"#": "skew-y"}, 190 "element": {"#": "skew-y"},
201 "maxValue" : 100, 191 "maxValue" : 100,
@@ -213,8 +203,7 @@
213 } 203 }
214 }, 204 },
215 "dtext_rotate" : { 205 "dtext_rotate" : {
216 "module": "js/components/hottextunit.reel", 206 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
217 "name": "HotTextUnit",
218 "properties": { 207 "properties": {
219 "element": {"#": "rotation"}, 208 "element": {"#": "rotation"},
220 "maxValue" : 360, 209 "maxValue" : 360,
@@ -233,8 +222,7 @@
233 }, 222 },
234 223
235 "mainCollapser" : { 224 "mainCollapser" : {
236 "module" : "js/panels/timeline/Collapser.js", 225 "prototype" : "js/panels/timeline/Collapser",
237 "name" : "Collapser",
238 "properties" : { 226 "properties" : {
239 "element" : {"#" : "content-main"}, 227 "element" : {"#" : "content-main"},
240 "myContent" : {"#" : "content-main"}, 228 "myContent" : {"#" : "content-main"},
@@ -254,8 +242,7 @@
254 }, 242 },
255 243
256 "positionCollapser" : { 244 "positionCollapser" : {
257 "module" : "js/panels/timeline/Collapser.js", 245 "prototype" : "js/panels/timeline/Collapser",
258 "name" : "Collapser",
259 "properties" : { 246 "properties" : {
260 "element" : {"#" : "content-position"}, 247 "element" : {"#" : "content-position"},
261 "myContent" : {"#":"content-position"}, 248 "myContent" : {"#":"content-position"},
@@ -275,8 +262,7 @@
275 }, 262 },
276 263
277 "transformCollapser" : { 264 "transformCollapser" : {
278 "module" : "js/panels/timeline/Collapser.js", 265 "prototype" : "js/panels/timeline/Collapser",