2 files changed, 25 insertions, 46 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 77481ac0..a6b7f9f1 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -121,9 +121,9 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
                                 },
-                                "animateCollapser" : {
+                                "bypassAnimation" : {
                                         "boundObject" : {"@" : "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
                                         "oneway" : false
                                 },
                                 "dtextPositionX" : {
@@ -241,9 +241,9 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
-                                "animateCollapser" : {
+                                "bypassAnimation" : {
                                         "boundObject" : {"@" : "repetition2"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
                                         "oneway" : false
                                 },
                                 "isStyleCollapsed" : {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 93fd170e..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";
@@ -501,14 +480,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleNewLayer:{
         value:function (event) {
-            var hashIndex = 0 , hashVariable = 0, layerResult, trackResult, layerObject, trackObject, dLayer, parentNode;
+            var hashIndex = 0 , hashVariable = 0, layerResult, layerObject, trackObject, dLayer, parentNode;
             if (this._hashFind) {
                 while (layerResult = this.returnedObject[hashIndex]) {
-                    trackResult = this.returnedTrack[hashIndex];
+                   // trackResult = this.returnedTrack[hashIndex];
                     if (layerResult.deleted !== true) {
                         
-                        // TODO: Help from Kruti
-                        this.arrTracks.push(trackResult);
+
+                        //this.arrTracks.push(trackResult);
                         this.arrLayers.push(layerResult);
 
                     }
@@ -524,8 +503,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
                             dLayer[hashVariable].deleted = false;
                             
-                            // TODO: Help from Kruti
-                            this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
+
+                            //this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
                             this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el);
                             this.selectLayer(event.detail._layerPosition);
                             break;
@@ -550,8 +529,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (dLayer[hashVariable]._layerID === event.detail._el._layerID) {
                             dLayer[hashVariable].deleted = false;
                             
-                            // TODO: Help from Kruti
-                            this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
+    
+                            //this.arrTracks.splice(event.detail._layerPosition, 0, event.detail._track);
                             this.arrLayers.splice(event.detail._layerPosition, 0, event.detail._el);
                             this.selectLayer(event.detail._layerPosition);
                             break;
@@ -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;
@@ -624,18 +604,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, myIndex);
                     
-                    // TODO: Help from Kruti
-                    this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
+
+                    //this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
                 } else {
                     this.arrLayers.splice(0, 0, thingToPush);
                     thingToPush.layerPosition = this.arrLayers.length - 1;
                     
-                    // TODO: Help from Kruti
-                    newTrack.trackPosition = this.arrTracks.length - 1;
+                    //newTrack.trackPosition = this.arrTracks.length - 1;
                     this._LayerUndoPosition = this.arrLayers.length - 1;
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);