From 03478f396977973f95977cf21c98bf6a2fa26721 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 12 Jun 2012 11:18:43 -0700 Subject: montage v10 serialization updates for timeline Signed-off-by: Jonathan Duran Conflicts: js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js Signed-off-by: Jonathan Duran --- js/panels/Timeline/Collapser.js | 34 ++++++++++++- js/panels/Timeline/Layer.reel/Layer.js | 13 +++++ .../Timeline/TimelineTrack.reel/TimelineTrack.html | 9 ++-- .../Timeline/TimelineTrack.reel/TimelineTrack.js | 58 +++++++++++++++++++--- 4 files changed, 101 insertions(+), 13 deletions(-) (limited to 'js/panels') diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 9c8d4434..42bbbb86 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: { value: true diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index acc0567c..f81d8b09 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -348,6 +348,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 0d7f517f..8c550f00 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html @@ -1,4 +1,4 @@ - +