2 files changed, 12 insertions, 35 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 77481ac0..ae1bcddf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -101,11 +101,6 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
-                                "animateCollapser" : {
-                                        "boundObject" : {"@" : "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
-                                        "oneway" : false
-                                },
                                 "isSelected" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
@@ -121,9 +116,9 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
                                 },
-                                "animateCollapser" : {
+                                "bypassAnimation" : {
                                         "boundObject" : {"@" : "repetition1"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.animateCollapser",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
                                         "oneway" : false
                                 },
                                 "dtextPositionX" : {
@@ -241,9 +236,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 c17a3290..9c782787 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -131,22 +131,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
@@ -335,7 +319,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         
                     }
                     // 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;
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
                 this.application.ninja.currentDocument.tlLayerHashTable = this.hashInstance;
@@ -347,8 +330,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         } 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.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
@@ -362,9 +344,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         }
                         
                 // 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;
         }
     },
     
@@ -386,7 +368,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.hashInstance = null;
             this.hashLayerNumber = null;
             this.hashElementMapToLayer = null;
-                        this.arrTracks = [];
                         this.arrLayers = [];
 
                 this.currentLayerNumber = 0;
@@ -551,7 +532,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             var ptrParent = nj.queryParentSelector(event.target, ".container-layer");
             if (ptrParent !== false) {
                 var myIndex = this.getActiveLayerIndex();
-                this.selectLayer(myIndex);
+                this.selectLayer(myIndex, true);
             }
         }
     },
@@ -678,6 +659,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;
@@ -986,7 +968,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     selectLayer:{
-        value:function (layerIndex) {
+        value:function (layerIndex, userSelection) {
             var i = 0;
             var arrLayersLength = this.arrLayers.length;
 
@@ -1004,7 +986,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.layerRepetition.selectedIndexes = [layerIndex];
                 this.trackRepetition.selectedIndexes = [layerIndex];
                 this.currentLayerSelected = this.arrLayers[layerIndex];
-                if(!this._openDoc){
+                if(userSelection){
                     if(this._captureSelection){
                         if(this.currentLayerSelected.elementsList.length >= 1){
                             this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList);