From 0b18fb2fef124a26204d5dba90cd82c975b69df3 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 23 Feb 2012 17:06:48 -0800
Subject: Timeline: Add hottext fields to layers and serialize them throughout.

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'js/panels/Timeline/TimelineTrack.reel')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fddfd170..67dbbced 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -358,10 +358,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     didDraw:{
         value:function () {
-            if (this._openDocRedrawCheck) {
-                this.retrieveStoredTweens();
-                this._openDocRedrawCheck = false;
-            }
+        	if(this.application.ninja.currentDocument.documentRoot.children[0]){
+	            if (this._openDocRedrawCheck) {
+	                this.retrieveStoredTweens();
+	                this._openDocRedrawCheck = false;
+	            }
+           }
         }
     },
 
@@ -542,7 +544,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function () {
             var that = this;
             
-            this.arrPositionTracks = [0, 1, 2];
+            this.arrPositionTracks = [0, 1];
             this.arrTransformTracks = [0, 1, 2, 3, 4];
             
             this.label = this.element.querySelector(".label-main");
-- 
cgit v1.2.3


From 1c4e8fbab587e589f348223847d6aac5c2df416b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 24 Feb 2012 14:06:57 -0800
Subject: Timeline: Bug fixes: Delete corresponding track when a style is
 deleted from a layer, and fix serialization variable problem.

---
 js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js/panels/Timeline/TimelineTrack.reel')

diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 27177a69..30280727 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -652,6 +652,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 	                this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
 	                this._styleCollapser.handleCollapserLabelClick();
             	}
+            } else if (layerEvent.layerEventType === "deleteStyle") {
+            	this.arrStyleTracks.pop();
             }
         }
     }
-- 
cgit v1.2.3