From 55e392b4ac5e45e8bf468399b3c0ddde669a15fd Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 12 Jun 2012 11:10:38 -0700 Subject: montage v10 serialization updates for timeline Signed-off-by: Jonathan Duran --- js/panels/Timeline/Collapser.js | 34 ++++++++++++- js/panels/Timeline/Layer.reel/Layer.js | 13 +++++ .../Timeline/TimelineTrack.reel/TimelineTrack.html | 8 ++-- .../Timeline/TimelineTrack.reel/TimelineTrack.js | 55 ++++++++++++++++++++-- 4 files changed, 101 insertions(+), 9 deletions(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 88314c8b..e5c04279 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js @@ -41,6 +41,7 @@ var Montage = require("montage/core/core").Montage, value: 0 }, contentHeight: { + serializable: true, get: function() { return this._contentHeight; }, @@ -59,6 +60,7 @@ var Montage = require("montage/core/core").Montage, value: false }, isAnimated: { + serializable: true, get: function() { return this._isAnimated; }, @@ -71,6 +73,7 @@ var Montage = require("montage/core/core").Montage, value: true }, bypassAnimation: { + serializable: true, get: function() { return this._bypassAnimation; }, @@ -102,6 +105,7 @@ var Montage = require("montage/core/core").Montage, value: "" }, isCollapsed : { + serializable: true, get: function() { return this._isCollapsed; }, @@ -110,7 +114,6 @@ var Montage = require("montage/core/core").Montage, this._isCollapsed = newVal; //this.needsDraw = true; } - } }, @@ -141,6 +144,7 @@ var Montage = require("montage/core/core").Montage, value: true }, isLabelClickable : { + serializable: true, get: function() { return this._isLabelClickable; }, @@ -149,6 +153,34 @@ var Montage = require("montage/core/core").Montage, } }, + _myContent:{ + value:null + }, + + myContent:{ + serializable:true, + get:function () { + return this._myContent; + }, + set:function (newVal) { + this._myContent = newVal; + } + }, + + _clicker:{ + value:null + }, + + clicker:{ + serializable:true, + get:function () { + return this._clicker; + }, + set:function (newVal) { + this._clicker = newVal; + } + }, + // isToggling: Bindable property. Set this (to anything) to trigger a toggle. _isToggling: { serializable: true, diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 6b64261e..a2d6444d 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -372,6 +372,19 @@ var Layer = exports.Layer = Montage.create(Component, { _layerEditable : { value: false }, + + _dynamicLayerName:{ + value:true + }, + dynamicLayerName:{ + serializable:true, + get:function () { + return this._dynamicLayerName; + }, + set:function (newVal) { + this._dynamicLayerName = newVal; + } + }, // Are the various collapsers collapsed or not _isMainCollapsed : { diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 5c5a8b76..091470f3 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html @@ -16,10 +16,10 @@ "element": {"#": "track"}, "tweenRepetition" : {"@" : "tweenRepetition"}, "tween": {"@" : "tween"}, - "_mainCollapser" : {"@" : "mainCollapser"}, - "_positionCollapser" : {"@" : "positionCollapser"}, - "_transformCollapser" : {"@" : "transformCollapser"}, - "_styleCollapser" : {"@" : "styleCollapser"} + "mainCollapser" : {"@" : "mainCollapser"}, + "positionCollapser" : {"@" : "positionCollapser"}, + "transformCollapser" : {"@" : "transformCollapser"}, + "styleCollapser" : {"@" : "styleCollapser"} } }, diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 75997466..87a5e156 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 var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { - tween: { - value: null - }, - _trackID:{ value:null }, @@ -31,6 +27,21 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } } }, + + _tween:{ + value:[] + }, + + tween:{ + serializable:true, + get:function () { + return this._tween; + }, + set:function (newVal) { + this._tween = newVal; + } + }, + _isVisible:{ value: true }, @@ -337,15 +348,51 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { _positionCollapser:{ value:null }, + positionCollapser:{ + serializable:true, + get:function(){ + return this._positionCollapser; + }, + set:function(val){ + this._positionCollapser = val; + } + }, _mainCollapser:{ value:null }, + mainCollapser:{ + serializable:true, + get:function () { + return this._mainCollapser; + }, + set:function (val) { + this._mainCollapser = val; + } + }, _transformCollapser:{ value:null }, + transformCollapser:{ + serializable:true, + get:function () { + return this._transformCollapser; + }, + set:function (val) { + this._transformCollapser = val; + } + }, _styleCollapser:{ value:null }, + styleCollapser:{ + serializable:true, + get:function () { + return this._styleCollapser; + }, + set:function (val) { + this._styleCollapser = val; + } + }, _trackData:{ value: false -- cgit v1.2.3