From 5689e3e2deda1b1f7ba32f6007ddab20f6c1fe64 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 2 Mar 2012 18:17:14 -0800
Subject: Timeline: Serialization of all Collapser components

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.js   | 30 ++++------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

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

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2001c3fb..7be34d74 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -97,22 +97,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _arrTracks:{
-        serializable:true,
-        value:[]
-    },
-
-    arrTracks:{
-        serializable:true,
-        get:function () {
-            return this._arrTracks;
-        },
-        set:function (newVal) {
-            this._arrTracks = newVal;
-            this._cacheArrays();
-        }
-    },
-
     _trackRepetition:{
         serializable:true,
         value:null
@@ -284,23 +268,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 	            _firstLayerDraw = true;
 	            
 	            // After recreating the tracks and layers, store the result in the currentDocument.
-				this.application.ninja.currentDocument.tlArrTracks = this.arrTracks;
 				this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
 				
 			} else {
 				// we do have information stored.  Use it.
 				this._boolCacheArrays = false;
-				this.arrLayers = [];
-				this.arrTracks = [];
+				//this.arrLayers = [];
 				this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
-				this.arrTracks = this.application.ninja.currentDocument.tlArrTracks;
 				this._boolCacheArrays = true;
 			}
 			
     		// Redraw all the things
-    		this.layerRepetition.needsDraw = true;
-    		this.trackRepetition.needsDraw = true;
-    		this.needsDraw = true;
+    		//this.layerRepetition.needsDraw = true;
+    		//this.trackRepetition.needsDraw = true;
+    		//this.needsDraw = true;
         }
     },
     
@@ -323,7 +304,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.hashTrackInstance = null;
             this.hashLayerNumber = null;
             this.hashElementMapToLayer = null;
-			this.arrTracks = [];
 			this.arrLayers = [];
 
     		this.currentLayerNumber = 0;
@@ -471,7 +451,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._firstTimeLoaded = false;
             } else {
                 this.arrLayers.length = 0;
-                this.arrTracks.length = 0;
 
                 if (event.detail.element.id === "UserContent") {
                     this._hashKey = "123";
@@ -578,6 +557,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 newLayerName = "Layer " + this.currentLayerNumber;
                 thingToPush.layerName = newLayerName;
                 thingToPush.layerID = this.currentLayerNumber;
+                thingToPush.bypassAnimation = false;
                 thingToPush.isMainCollapsed = true;
                 thingToPush.isPositionCollapsed = true;
                 thingToPush.isTransformCollapsed = true;
-- 
cgit v1.2.3