diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 2af78f9a..a4b598c5 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html @@ -22,7 +22,7 @@ -

\ No newline at end of file diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 3d3aef1b..8baa141a 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html @@ -22,7 +22,7 @@ -

diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html index 9fb098de..5be159c3 100644 --- a/js/panels/Timeline/Style.reel/Style.html +++ b/js/panels/Timeline/Style.reel/Style.html @@ -65,23 +65,23 @@ -

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html index f10e9ac9..19709ca7 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html @@ -151,29 +151,29 @@ -

00:00:00

Master Layer

- +

@@ -224,7 +224,7 @@

diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html index 9c72f430..0f0c7c9c 100644 --- a/js/panels/Timeline/Track.reel/Track.html +++ b/js/panels/Timeline/Track.reel/Track.html @@ -53,9 +53,9 @@ -

diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html index 47778b5d..54944e5d 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html @@ -22,8 +22,8 @@ -

diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html index c161b3f8..aba42436 100644 --- a/js/panels/Timeline/Tween.reel/Tween.html +++ b/js/panels/Timeline/Tween.reel/Tween.html @@ -37,9 +37,9 @@ -

-- cgit v1.2.3 From a8ad82e6595b75838305eb4fa83385a42053ffd6 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Mon, 30 Apr 2012 16:00:41 -0700 Subject: Timeline: Change serialization parameters for some component properties. --- js/panels/Timeline/Layer.reel/Layer.js | 42 +++++----------------- js/panels/Timeline/Style.reel/Style.js | 6 ---- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 15 ++------ .../Timeline/TimelineTrack.reel/TimelineTrack.js | 34 +----------------- js/panels/Timeline/Track.reel/Track.js | 12 ++----- js/panels/Timeline/Tween.reel/Tween.js | 5 --- 6 files changed, 16 insertions(+), 98 deletions(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index f2e20d41..0fb91634 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, { /* Style models: the array of styles, and the repetition that uses them */ _arrLayerStyles : { - serializable: true, - enumerable: true, value: [] }, arrLayerStyles : { serializable: true, - enumerable: true, get: function() { return this._arrLayerStyles; }, @@ -142,8 +139,7 @@ var Layer = exports.Layer = Montage.create(Component, { /* Position and Transform hottext values */ _dtextPositionX : { - value:null, - serializable: true + value:null }, dtextPositionX:{ @@ -161,8 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextPositionY : { - value:null, - serializable: true + value:null }, dtextPositionY:{ @@ -180,8 +175,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextScaleX : { - value:null, - serializable: true + value:null }, dtextScaleX:{ @@ -199,8 +193,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextScaleY : { - value:null, - serializable: true + value:null }, dtextScaleY:{ @@ -218,8 +211,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextSkewX : { - value:null, - serializable: true + value:null }, dtextSkewX:{ @@ -237,8 +229,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextSkewY : { - value:null, - serializable: true + value:null }, dtextSkewY:{ @@ -256,8 +247,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, _dtextRotate : { - value:null, - serializable: true + value:null }, dtextRotate:{ @@ -276,10 +266,7 @@ var Layer = exports.Layer = Montage.create(Component, { /* isSelected: whether or not the layer is currently selected. */ _isSelected:{ - value: false, - writable: true, - serializable: true, - enumerable: false + value: false }, isSelected:{ @@ -319,9 +306,7 @@ var Layer = exports.Layer = Montage.create(Component, { _isAnimated:{ - value: false, - writable: true, - enumerable: false + value: false }, isAnimated:{ @@ -363,7 +348,6 @@ var Layer = exports.Layer = Montage.create(Component, { // Are the various collapsers collapsed or not _isMainCollapsed : { - serializable: true, value: true }, isMainCollapsed : { @@ -379,7 +363,6 @@ var Layer = exports.Layer = Montage.create(Component, { }, _isTransformCollapsed : { - serializable: true, value: true }, isTransformCollapsed : { @@ -394,7 +377,6 @@ var Layer = exports.Layer = Montage.create(Component, { }, _isPositionCollapsed : { - serializable: true, value: true }, isPositionCollapsed : { @@ -409,7 +391,6 @@ var Layer = exports.Layer = Montage.create(Component, { }, _isStyleCollapsed : { - serializable: true, value: true }, isStyleCollapsed : { @@ -423,7 +404,6 @@ var Layer = exports.Layer = Montage.create(Component, { } }, _bypassAnimation : { - serializable: true, value: false }, bypassAnimation : { @@ -445,12 +425,10 @@ var Layer = exports.Layer = Montage.create(Component, { }, _layerData:{ - serializable:true, value:{} }, layerData:{ - serializable:true, get:function(){ return this._layerData; }, @@ -504,11 +482,9 @@ var Layer = exports.Layer = Montage.create(Component, { /* Data binding point and outgoing binding trigger method */ _bindingPoint : { - serializable: true, value : {} }, bindingPoint: { - serializable: true, get: function() { return this._bindingPoint; }, diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js index 027f3a40..c39f3a56 100644 --- a/js/panels/Timeline/Style.reel/Style.js +++ b/js/panels/Timeline/Style.reel/Style.js @@ -27,7 +27,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { /* === BEGIN: Models === */ // isSelected: whether or not the style is selected _isSelected: { - serializable: true, value: false }, isSelected: { @@ -60,7 +59,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // Property for this editor _editorProperty: { - serializable: true, value: "" }, editorProperty: { @@ -76,7 +74,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // Value for the property for this editor. _editorValue: { - serializable: true, value: "" }, editorValue: { @@ -92,7 +89,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // The tweener used to change the value for this property. _ruleTweener: { - serializable: true, value: false }, ruleTweener: { @@ -137,7 +133,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // whichView: which view should we show: hintable or propval _whichView : { - serializable: true, value: "hintable" }, whichView: { @@ -161,7 +156,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, { // styleID: the id for this style; // Used to publish events _styleID : { - serializable: true, value: null }, styleID: { diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 70e04b4c..64303cef 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -16,7 +16,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { /* === BEGIN: Models === */ _arrLayers:{ - serializable:true, value:[] }, @@ -47,12 +46,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { _layerRepetition:{ - serializable:true, value:null }, layerRepetition:{ - serializable:true, get:function () { return this._layerRepetition; }, @@ -170,7 +167,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { }, _masterDuration:{ - serializable:true, value:0 }, @@ -186,12 +182,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { }, _trackRepetition:{ - serializable:true, value:null }, trackRepetition:{ - serializable:true, get:function () { return this._trackRepetition; }, @@ -249,18 +243,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { }, _firstTimeLoaded:{ - value:true, - writable:true + value:true }, _captureSelection:{ - value:false, - writable:true + value:false }, _openDoc:{ - value:false, - writable:true + value:false }, timeMarkerHolder:{ diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index e46a5eb0..efeeba00 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js @@ -16,7 +16,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _trackID:{ - serializable:true, value:null }, @@ -105,7 +104,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } }, _bypassAnimation : { - serializable: true, value: false }, bypassAnimation : { @@ -122,13 +120,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _arrStyleTracks : { - serializable:true, - enumerable:true, value: [] }, arrStyleTracks: { serializable:true, - enumerable:true, get: function() { return this._arrStyleTracks; }, @@ -138,11 +133,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } }, _styleTracksRepetition: { - serializable: true, value: null }, styleTracksRepetition : { - serializable: true, get: function() { return this._styleTracksRepetition; }, @@ -153,13 +146,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { /* Position Property Tracks */ _arrPositionTracks : { - serializable:true, - enumerable:true, value: [] }, arrPositionTracks: { serializable:true, - enumerable:true, get: function() { return this._arrPositionTracks; }, @@ -169,11 +159,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } }, _positionTracksRepetition: { - serializable: true, value: null }, positionTracksRepetition : { - serializable: true, get: function() { return this._positionTracksRepetition; }, @@ -185,13 +173,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { /* Transform Property Tracks */ _arrTransformTracks : { - serializable:true, - enumerable:true, value: [] }, arrTransformTracks: { serializable:true, - enumerable:true, get: function() { return this._arrTransformTracks; }, @@ -201,11 +186,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { } }, _transformTracksRepetition: { - serializable: true, value: null }, transformTracksRepetition : { - serializable: true, get: function() { return this._transformTracksRepetition; }, @@ -215,12 +198,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _tweens:{ - enumerable: false, value:[] }, tweens:{ - serializable:true, + serializable: true, get:function () { return this._tweens; }, @@ -231,12 +213,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _tweenRepetition:{ - serializable:true, value:null }, tweenRepetition:{ - serializable:true, get:function () { return this._spanRepetition; }, @@ -246,7 +226,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _trackDuration:{ - serializable: true, value:0 }, @@ -265,7 +244,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _trackPosition:{ - serializable:true, value:0 }, @@ -281,7 +259,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _currentKeyframeRule:{ - serializable: true, value:null }, @@ -305,7 +282,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _isTrackAnimated:{ - serializable: true, value:null }, @@ -322,12 +298,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { // should be unneeded with one element per layer restriction _animatedElement:{ - enumerable: true, - serializable:true, value:null }, animatedElement:{ - enumerable: true, serializable:true, get:function () { return this._animatedElement; @@ -339,7 +312,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _animationName:{ - serializable:true, value:null }, @@ -372,12 +344,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { }, _trackData:{ - serializable: true, value: false }, trackData:{ - serializable:true, get:function(){ return this._trackData; }, @@ -419,11 +389,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { // Data binding observation point and trigger method _bindingPoint : { - serializable: true, value : {} }, bindingPoint: { - serializable: true, get: function() { return this._bindingPoint; }, diff --git a/js/panels/Timeline/Track.reel/Track.js b/js/panels/Timeline/Track.reel/Track.js index cfc2541b..8c52199a 100644 --- a/js/panels/Timeline/Track.reel/Track.js +++ b/js/panels/Timeline/Track.reel/Track.js @@ -15,9 +15,7 @@ var Track = exports.Track = Montage.create(Component, { }, _trackID:{ - value:null, - writable:true, - enumerable:true + value:null }, trackID:{ @@ -30,7 +28,6 @@ var Track = exports.Track = Montage.create(Component, { }, _spans:{ - serializable:true, value:[] }, @@ -45,12 +42,10 @@ var Track = exports.Track = Montage.create(Component, { }, _spanRepetition:{ - serializable:true, value:null }, spanRepetition:{ - serializable:true, get:function () { return this._spanRepetition; }, @@ -85,9 +80,8 @@ var Track = exports.Track = Montage.create(Component, { //TEMP keyFrames:{ - value:[], - writable:true, - enumerable:true + serializable: true, + value:[] }, prepareForDraw: { diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index b13a037f..8b6826ed 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -14,12 +14,10 @@ var Tween = exports.Tween = Montage.create(Component, { }, _tweenData:{ - serializable: true, value:{} }, tweenData:{ - serializable: true, get:function(){ return this._tweenData; }, @@ -32,7 +30,6 @@ var Tween = exports.Tween = Montage.create(Component, { }, _spanWidth: { - serializable: true, value: 0 }, @@ -109,7 +106,6 @@ var Tween = exports.Tween = Montage.create(Component, { }, _tweenedProperties:{ - serializable: true, value:[] }, @@ -124,7 +120,6 @@ var Tween = exports.Tween = Montage.create(Component, { }, _isTweenAnimated:{ - serializable:true, value:false }, -- cgit v1.2.3 From d917e865cbc7fd8929e068aeba967af1bd64c5e7 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Mon, 30 Apr 2012 17:34:11 -0700 Subject: Timeline: bug fix: disable bread crumb setlevel. --- js/panels/Timeline/Layer.reel/Layer.js | 1 + js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 0fb91634..b23da749 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -558,6 +558,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, didDraw: { value: function() { + // console.log("Layer.didDraw: Layer "+ this.layerID ); if (this._isFirstDraw === true) { if (this.isSelected === true) { if (this.application.ninja.currentDocument._uuid === this._docUUID) { diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 64303cef..6e64cde0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -705,7 +705,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // there is a currentDocument. We don't do anything at that time. return; } - this.application.ninja.currentDocument.setLevel = true; + // this.application.ninja.currentDocument.setLevel = true; this._boolCacheArrays = false; this.clearTimelinePanel(); this._boolCacheArrays = true; -- cgit v1.2.3 From 92e7297c153b432ede5b95d86cd934c990ebe768 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 3 May 2012 10:57:45 -0700 Subject: Dom Manipulation Signed-off-by: Kruti Shah --- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 70e04b4c..66ef1b97 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -278,6 +278,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { _dragLayerID : { value: null }, + + layersDragged:{ + value:[], + writable:true + }, + dragLayerID : { get: function() { return this._dragLayerID; @@ -302,6 +308,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), dragLayer = this.arrLayers[dragLayerIndex]; + this.layersDragged.push(dragLayer); + this._layerDroppedInPlace = this.arrLayers[dropLayerIndex]; this.arrLayers.splice(dragLayerIndex, 1); this.arrLayers.splice(dropLayerIndex, 0, dragLayer); @@ -403,6 +411,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this._deleteHelper = false; } } + this.application.ninja.elementMediator.reArrangeDOM(this.layersDragged , this._layerDroppedInPlace); + this.layersDragged =[]; } } }, @@ -903,15 +913,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { } }, - - - - - - - - - deselectTweens:{ value:function () { for (var i = 0; i < this.selectedTweens.length; i++) { @@ -1038,7 +1039,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this._openDoc = false; - } }, -- cgit v1.2.3