From 5e010900b91d8634ba6caed0c97ccc1ccdec1ff7 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 00:13:28 -0700 Subject: adding more missing properties to the timeline Signed-off-by: Valerio Virgillito --- js/panels/Timeline/Layer.reel/Layer.js | 38 ++++++++++++++++++++-- js/panels/Timeline/Style.reel/Style.js | 30 ++++++++++++++--- .../Timeline/TimelineTrack.reel/TimelineTrack.js | 4 +-- js/panels/Timeline/Track.reel/Track.js | 5 +-- js/panels/Timeline/Tween.reel/Tween.js | 10 ++++-- 5 files changed, 74 insertions(+), 13 deletions(-) (limited to 'js/panels') diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 16fb0303..474190b9 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -15,8 +15,39 @@ var nj = require("js/lib/NJUtils").NJUtils; var Layer = exports.Layer = Montage.create(Component, { - hasTemplate:{ - value: true + dynamicLayerName: { + value: null, + serializable: true + }, + + dynamicLayerTag: { + value: null, + serializable: true + }, + + positionCollapser: { + value: null, + serializable: true + }, + + transformCollapser: { + value: null, + serializable: true + }, + + styleCollapser: { + value: null, + serializable: true + }, + + clickerMain: { + value: null, + serializable: true + }, + + myLabel: { + value: null, + serializable: true }, /* Begin: Models */ @@ -31,7 +62,8 @@ var Layer = exports.Layer = Montage.create(Component, { }, set: function(newVal) { this._mainCollapser = newVal; - } + }, + serializable: true }, /* Style models: the array of styles, and the repetition that uses them */ diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index c39f3a56..eed58a65 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js @@ -20,10 +20,31 @@ var Component = require("montage/ui/component").Component; var LayerStyle = exports.LayerStyle = Montage.create(Component, { - hasTemplate:{ - value: true + styleContainer: { + value: null, + serializable: true }, - + + styleHintable: { + value: null, + serializable: true + }, + + styleProperty: { + value: null, + serializable: true + }, + + valueEditorHottext: { + value: null, + serializable: true + }, + + dtextProperty: { + value: null, + serializable: true + }, + /* === BEGIN: Models === */ // isSelected: whether or not the style is selected _isSelected: { @@ -112,7 +133,8 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { }, set: function(newVal) { this._myHintable = newVal; - } + }, + serializable: true }, _myHintableValue : { value: null diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 126e6a61..7cfe07a6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js @@ -11,8 +11,8 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { - hasTemplate:{ - value:true + tween: { + value: null }, _trackID:{ diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index 8c52199a..2ef760b7 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js @@ -10,8 +10,9 @@ var defaultEventManager = require("montage/core/event/event-manager").defaultEve var Track = exports.Track = Montage.create(Component, { - hasTemplate:{ - value: true + track_lane: { + value: null, + serializable: true }, _trackID:{ diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 8b6826ed..dda06028 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -9,8 +9,14 @@ var Component = require("montage/ui/component").Component; var Tween = exports.Tween = Montage.create(Component, { - hasTemplate:{ - value: true + keyframe: { + value: null, + serializable: true + }, + + tweenspan: { + value: null, + serializable: true }, _tweenData:{ -- cgit v1.2.3