diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/Timeline | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 4 | ||||
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 43 | ||||
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.html | 12 | ||||
-rw-r--r-- | js/panels/Timeline/Style.reel/Style.js | 6 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html | 60 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 39 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 1 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 34 | ||||
-rw-r--r-- | js/panels/Timeline/Track.reel/Track.html | 6 | ||||
-rw-r--r-- | js/panels/Timeline/Track.reel/Track.js | 12 | ||||
-rw-r--r-- | js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | 4 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.html | 6 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 5 |
16 files changed, 77 insertions, 161 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html index 6f9a6d05..4b029874 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.html +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html | |||
@@ -22,7 +22,7 @@ | |||
22 | </head> | 22 | </head> |
23 | <body> | 23 | <body> |
24 | 24 | ||
25 | <div id="keyframespace" class="tween_keyframe"> | 25 | <div data-montage-id="keyframespace" class="tween_keyframe"> |
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | </body> | 28 | </body> |
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 10334b31..9288d718 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -17,14 +17,12 @@ | |||
17 | "styleRepetition" : {"@":"repetition1"}, | 17 | "styleRepetition" : {"@":"repetition1"}, |
18 | "dynamicLayerName" : {"@":"dtext1"}, | 18 | "dynamicLayerName" : {"@":"dtext1"}, |
19 | "dynamicLayerTag" : {"@": "dtext2"}, | 19 | "dynamicLayerTag" : {"@": "dtext2"}, |
20 | "slotStyle" : {"@":"slot1"}, | ||
21 | "mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
22 | "positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
23 | "transformCollapser" : {"@" : "transformCollapser"}, | 22 | "transformCollapser" : {"@" : "transformCollapser"}, |
24 | "styleCollapser" : {"@" : "styleCollapser"}, | 23 | "styleCollapser" : {"@" : "styleCollapser"}, |
25 | "clickerMain" : {"#" : "clicker-main"}, | 24 | "clickerMain" : {"#" : "clicker-main"}, |
26 | "myLabel" : {"#" : "myLabel"}, | 25 | "myLabel" : {"#" : "myLabel"} |
27 | "dragDrop" : {"@" : "DragDrop"} | ||
28 | } | 26 | } |
29 | }, | 27 | }, |
30 | "dtext1" : { | 28 | "dtext1" : { |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index f2e20d41..b23da749 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -36,13 +36,10 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
36 | 36 | ||
37 | /* Style models: the array of styles, and the repetition that uses them */ | 37 | /* Style models: the array of styles, and the repetition that uses them */ |
38 | _arrLayerStyles : { | 38 | _arrLayerStyles : { |
39 | serializable: true, | ||
40 | enumerable: true, | ||
41 | value: [] | 39 | value: [] |
42 | }, | 40 | }, |
43 | arrLayerStyles : { | 41 | arrLayerStyles : { |
44 | serializable: true, | 42 | serializable: true, |
45 | enumerable: true, | ||
46 | get: function() { | 43 | get: function() { |
47 | return this._arrLayerStyles; | 44 | return this._arrLayerStyles; |
48 | }, | 45 | }, |
@@ -142,8 +139,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
142 | 139 | ||
143 | /* Position and Transform hottext values */ | 140 | /* Position and Transform hottext values */ |
144 | _dtextPositionX : { | 141 | _dtextPositionX : { |
145 | value:null, | 142 | value:null |
146 | serializable: true | ||
147 | }, | 143 | }, |
148 | 144 | ||
149 | dtextPositionX:{ | 145 | dtextPositionX:{ |
@@ -161,8 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
161 | }, | 157 | }, |
162 | 158 | ||
163 | _dtextPositionY : { | 159 | _dtextPositionY : { |
164 | value:null, | 160 | value:null |
165 | serializable: true | ||
166 | }, | 161 | }, |
167 | 162 | ||
168 | dtextPositionY:{ | 163 | dtextPositionY:{ |
@@ -180,8 +175,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
180 | }, | 175 | }, |
181 | 176 | ||
182 | _dtextScaleX : { | 177 | _dtextScaleX : { |
183 | value:null, | 178 | value:null |
184 | serializable: true | ||
185 | }, | 179 | }, |
186 | 180 | ||
187 | dtextScaleX:{ | 181 | dtextScaleX:{ |
@@ -199,8 +193,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
199 | }, | 193 | }, |
200 | 194 | ||
201 | _dtextScaleY : { | 195 | _dtextScaleY : { |
202 | value:null, | 196 | value:null |
203 | serializable: true | ||
204 | }, | 197 | }, |
205 | 198 | ||
206 | dtextScaleY:{ | 199 | dtextScaleY:{ |
@@ -218,8 +211,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
218 | }, | 211 | }, |
219 | 212 | ||
220 | _dtextSkewX : { | 213 | _dtextSkewX : { |
221 | value:null, | 214 | value:null |
222 | serializable: true | ||
223 | }, | 215 | }, |
224 | 216 | ||
225 | dtextSkewX:{ | 217 | dtextSkewX:{ |
@@ -237,8 +229,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
237 | }, | 229 | }, |
238 | 230 | ||
239 | _dtextSkewY : { | 231 | _dtextSkewY : { |
240 | value:null, | 232 | value:null |
241 | serializable: true | ||
242 | }, | 233 | }, |
243 | 234 | ||
244 | dtextSkewY:{ | 235 | dtextSkewY:{ |
@@ -256,8 +247,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
256 | }, | 247 | }, |
257 | 248 | ||
258 | _dtextRotate : { | 249 | _dtextRotate : { |
259 | value:null, | 250 | value:null |
260 | serializable: true | ||
261 | }, | 251 | }, |
262 | 252 | ||
263 | dtextRotate:{ | 253 | dtextRotate:{ |
@@ -276,10 +266,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
276 | 266 | ||
277 | /* isSelected: whether or not the layer is currently selected. */ | 267 | /* isSelected: whether or not the layer is currently selected. */ |
278 | _isSelected:{ | 268 | _isSelected:{ |
279 | value: false, | 269 | value: false |
280 | writable: true, | ||
281 | serializable: true, | ||
282 | enumerable: false | ||
283 | }, | 270 | }, |
284 | 271 | ||
285 | isSelected:{ | 272 | isSelected:{ |
@@ -319,9 +306,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
319 | 306 | ||
320 | 307 | ||
321 | _isAnimated:{ | 308 | _isAnimated:{ |
322 | value: false, | 309 | value: false |
323 | writable: true, | ||
324 | enumerable: false | ||
325 | }, | 310 | }, |
326 | 311 | ||
327 | isAnimated:{ | 312 | isAnimated:{ |
@@ -363,7 +348,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
363 | 348 | ||
364 | // Are the various collapsers collapsed or not | 349 | // Are the various collapsers collapsed or not |
365 | _isMainCollapsed : { | 350 | _isMainCollapsed : { |
366 | serializable: true, | ||
367 | value: true | 351 | value: true |
368 | }, | 352 | }, |
369 | isMainCollapsed : { | 353 | isMainCollapsed : { |
@@ -379,7 +363,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
379 | }, | 363 | }, |
380 | 364 | ||
381 | _isTransformCollapsed : { | 365 | _isTransformCollapsed : { |
382 | serializable: true, | ||
383 | value: true | 366 | value: true |
384 | }, | 367 | }, |
385 | isTransformCollapsed : { | 368 | isTransformCollapsed : { |
@@ -394,7 +377,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
394 | }, | 377 | }, |
395 | 378 | ||
396 | _isPositionCollapsed : { | 379 | _isPositionCollapsed : { |
397 | serializable: true, | ||
398 | value: true | 380 | value: true |
399 | }, | 381 | }, |
400 | isPositionCollapsed : { | 382 | isPositionCollapsed : { |
@@ -409,7 +391,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
409 | }, | 391 | }, |
410 | 392 | ||