diff options
| author | Jonathan Duran | 2012-06-12 11:18:43 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-12 11:18:43 -0700 |
| commit | 03478f396977973f95977cf21c98bf6a2fa26721 (patch) | |
| tree | f1813de0471d9deb3fba1981d169cdaf39570b74 /js/panels/Timeline/TimelineTrack.reel | |
| parent | f555dbb070dae53bf81f49d148d59f0a32726811 (diff) | |
| download | ninja-03478f396977973f95977cf21c98bf6a2fa26721.tar.gz | |
montage v10 serialization updates for timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 9 | ||||
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 58 |
2 files changed, 55 insertions, 12 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 0d7f517f..8c550f00 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.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/> |
| @@ -17,9 +17,10 @@ | |||
| 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 18 | "track_lanes" : {"#" : "track_lanes"}, | 18 | "track_lanes" : {"#" : "track_lanes"}, |
| 19 | "tween": {"@" : "tween"}, | 19 | "tween": {"@" : "tween"}, |
| 20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
| 21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
| 22 | "_styleCollapser" : {"@" : "styleCollapser"} | 22 | "transformCollapser" : {"@" : "transformCollapser"}, |
| 23 | "styleCollapser" : {"@" : "styleCollapser"} | ||
| 23 | } | 24 | } |
| 24 | }, | 25 | }, |
| 25 | 26 | ||
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 3b2b3fff..adad6ff3 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
| @@ -11,10 +11,6 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve | |||
| 11 | 11 | ||
| 12 | var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | 12 | var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { |
| 13 | 13 | ||
| 14 | hasTemplate:{ | ||
| 15 | value:true | ||
| 16 | }, | ||
| 17 | |||
| 18 | _trackID:{ | 14 | _trackID:{ |
| 19 | value:null | 15 | value:null |
| 20 | }, | 16 | }, |
| @@ -31,11 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
| 31 | } | 27 | } |
| 32 | } | 28 | } |
| 33 | }, | 29 | }, |
| 34 | 30 | ||
| 35 | _isFirstDraw: { | 31 | _tween:{ |
| 36 | value: true | 32 | value:[] |
| 37 | }, | 33 | }, |
| 38 | 34 | ||
| 35 | tween:{ | ||
| 36 | serializable:true, | ||
| 37 | get:function () { | ||
| 38 | return this._tween; | ||
| 39 | }, | ||
| 40 | set:function (newVal) { | ||
| 41 | this._tween = newVal; | ||
| 42 | } | ||
| 43 | }, | ||
| 44 | |||
| 39 | _isVisible:{ | 45 | _isVisible:{ |
| 40 | value: true | 46 | value: true |
| 41 | }, | 47 | }, |
| @@ -345,15 +351,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
| 345 | _positionCollapser:{ | 351 | _positionCollapser:{ |
| 346 | value:null | 352 | value:null |
| 347 | }, | 353 | }, |
| 354 | positionCollapser:{ | ||
| 355 | serializable:true, | ||
| 356 | get:function(){ | ||
| 357 | return this._positionCollapser; | ||
| 358 | }, | ||
| 359 | set:function(val){ | ||
| 360 | this._positionCollapser = val; | ||
| 361 | } | ||
| 362 | }, | ||
| 348 | _mainCollapser:{ | 363 | _mainCollapser:{ |
| 349 | value:null | 364 | value:null |
| 350 | }, | 365 | }, |
| 366 | mainCollapser:{ | ||
| 367 | serializable:true, | ||
| 368 | get:function () { | ||
| 369 | return this._mainCollapser; | ||
| 370 | }, | ||
| 371 | set:function (val) { | ||
| 372 | this._mainCollapser = val; | ||
| 373 | } | ||
| 374 | }, | ||
| 351 | _transformCollapser:{ | 375 | _transformCollapser:{ |
| 352 | value:null | 376 | value:null |
| 353 | }, | 377 | }, |
| 378 | transformCollapser:{ | ||
| 379 | serializable:true, | ||
| 380 | get:function () { | ||
| 381 | return this._transformCollapser; | ||
| 382 | }, | ||
| 383 | set:function (val) { | ||
| 384 | this._transformCollapser = val; | ||
| 385 | } | ||
| 386 | }, | ||
| 354 | _styleCollapser:{ | 387 | _styleCollapser:{ |
| 355 | value:null | 388 | value:null |
| 356 | }, | 389 | }, |
| 390 | styleCollapser:{ | ||
| 391 | serializable:true, | ||
| 392 | get:function () { | ||
| 393 | return this._styleCollapser; | ||
| 394 | }, | ||
| 395 | set:function (val) { | ||
| 396 | this._styleCollapser = val; | ||
| 397 | } | ||
| 398 | }, | ||
| 357 | 399 | ||
| 358 | // Drag and Drop properties | 400 | // Drag and Drop properties |
| 359 | _dragAndDropHelper : { | 401 | _dragAndDropHelper : { |