1 files changed, 94 insertions, 116 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 9c782787..54c40676 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -284,12 +284,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             var myIndex;
                         this.drawTimeMarkers();
-
             // Document switching
                         // Check to see if we have saved timeline information in the currentDocument.
                         if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
                                 // No, we have no information stored.  Create it.
-                                this.log('newfile ' + this.application.ninja.currentDocument.name)
                                 this.application.ninja.currentDocument.isTimelineInitialized = true;
                                 this.application.ninja.currentDocument.tlArrLayers = [];
                                 this.application.ninja.currentDocument.tlArrTracks = [];
@@ -324,29 +322,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.application.ninja.currentDocument.tlLayerHashTable = this.hashInstance;
                 this.application.ninja.currentDocument.tlElementHashTable = this.hashElementMapToLayer;
                 this.application.ninja.currentDocument.hashKey=this.hashKey;
-
-
-                                
                         } else {
                                 // we do have information stored.  Use it.
                                 this._boolCacheArrays = false;
-                                //this.arrLayers = [];
                                 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
-                                this.arrTracks = this.application.ninja.currentDocument.tlArrTracks;
                 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.hashInstance = this.application.ninja.currentDocument.tlLayerHashTable;
                 this.hashElementMapToLayer = this.application.ninja.currentDocument.tlElementHashTable;
                 this.hashKey = this.application.ninja.currentDocument.hashKey;
                 this.selectLayer(0);
                                 this._boolCacheArrays = true;
-
-
                         }
-                        
-                // Redraw all the things
-                //this.layerRepetition.needsDraw = true;
-                //this.trackRepetition.needsDraw = true;
-                //this.needsDraw = true;
         }
     },
     
@@ -390,7 +376,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._bindDocumentEvents();
                 
             this.hashInstance = this.createLayerHashTable();
-            this.hashLayerNumber = this.createLayerNumberHash();
+            //this.hashLayerNumber = this.createLayerNumberHash();
             this.hashElementMapToLayer = this.createElementMapToLayer();
             this.initTimelineForDocument();
         }
@@ -545,8 +531,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 if (object._el.parentElementUUID !== this.application.ninja.currentSelectedContainer.uuid) {
                     dLayer = this.hashInstance.getItem(object._el.parentElementUUID);
                     while (dLayer[hashVariable]) {
-                        if (dLayer[hashVariable]._layerID === object._el._layerID) {
-                            dLayer[hashVariable].deleted = false;
+                        if (dLayer[hashVariable].layerData._layerID === object._el._layerID) {
+                            dLayer[hashVariable].layerData.deleted = false;
                             parentNode = dLayer[hashVariable].parentElement;
                             break;
                         }
@@ -556,9 +542,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.LayerBinding(parentNode);
                 } else {
                     dLayer = this.hashInstance.getItem(object._el.parentElementUUID);
-                    while (dLayer[hashVariable]) {
-                        if (dLayer[hashVariable]._layerID === object._el._layerID) {
-                            dLayer[hashVariable].deleted = false;
+                    while (dLayer[hashVariable].layerData) {
+                        if (dLayer[hashVariable].layerData._layerID === object._el._layerID) {
+                            dLayer[hashVariable].layerData.deleted = false;
 
                             this.arrLayers.splice(object._layerPosition, 0, object._el);
                             this.selectLayer(object._layerPosition);
@@ -573,58 +559,55 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             var newLayerName = "",
                 thingToPush = {},
                 myIndex = 0;
+            thingToPush.layerData = {};
 
-//            this.currentLayerNumber = this.hashLayerNumber.getItem(this._hashKey);
-//            if (this.currentLayerNumber === undefined) {
-//                this.currentLayerNumber = 0;
-//            }
 
             this.currentLayerNumber = this.currentLayerNumber + 1;
             newLayerName = "Layer " + this.currentLayerNumber;
-            thingToPush.layerName = newLayerName;
-            thingToPush.layerID = this.currentLayerNumber;
-            thingToPush.isMainCollapsed = true;
-            thingToPush.isPositionCollapsed = true;
-            thingToPush.isTransformCollapsed = true;
-            thingToPush.isStyleCollapsed = true;
-            thingToPush.arrLayerStyles = [];
-            thingToPush.elementsList = [];
-            thingToPush.deleted = false;
-            thingToPush.isSelected = false;
-            thingToPush.created=false;
-            thingToPush.isTrackAnimated = false;
-            thingToPush.currentKeyframeRule = null;
-            thingToPush.trackPosition = 0;
-            thingToPush.arrStyleTracks = [];
-            thingToPush.tweens = [];
+            thingToPush.layerData.layerName = newLayerName;
+            thingToPush.layerData.layerID = this.currentLayerNumber;
+            thingToPush.layerData.isMainCollapsed = true;
+            thingToPush.layerData.isPositionCollapsed = true;
+            thingToPush.layerData.isTransformCollapsed = true;
+            thingToPush.layerData.isStyleCollapsed = true;
+            thingToPush.layerData.arrLayerStyles = [];
+            thingToPush.layerData.elementsList = [];
+            thingToPush.layerData.deleted = false;
+            thingToPush.layerData.isSelected = false;
+            thingToPush.layerData.created=false;
+            thingToPush.layerData.isTrackAnimated = false;
+            thingToPush.layerData.currentKeyframeRule = null;
+            thingToPush.layerData.trackPosition = 0;
+            thingToPush.layerData.arrStyleTracks = [];
+            thingToPush.layerData.tweens = [];
 
             thingToPush.parentElementUUID = this.hashKey;
             thingToPush.parentElement = this.application.ninja.currentSelectedContainer;
 
             if (!!this.layerRepetition.selectedIndexes) {
                 myIndex = this.layerRepetition.selectedIndexes[0];
-                thingToPush.layerPosition = myIndex;
-                thingToPush.isSelected = true;
-                thingToPush.trackPosition = myIndex;
+                thingToPush.layerData.layerPosition = myIndex;
+                thingToPush.layerData.isSelected = true;
+                thingToPush.layerData.trackPosition = myIndex;
                 this.arrLayers.splice(myIndex, 0, thingToPush);
                 this._LayerUndoPosition = myIndex;
                 this.selectLayer(myIndex);
-                this.hashLayerNumber.setItem(this.hashKey, thingToPush);
-                this.hashInstance.setItem(this.hashKey, thingToPush, myIndex);
+                //this.hashLayerNumber.setItem(this.hashKey, thingToPush.layerData);
+                this.hashInstance.setItem(this.hashKey, thingToPush.layerData, myIndex);
 
 
             } else {
                 this.arrLayers.splice(0, 0, thingToPush);
-                thingToPush.layerPosition = this.arrLayers.length - 1;
+                thingToPush.layerData.layerPosition = this.arrLayers.length - 1;
                 this._LayerUndoPosition = this.arrLayers.length - 1;
-                this.hashLayerNumber.setItem(this.hashKey, thingToPush);
-                this.hashInstance.setItem(this.hashKey, thingToPush, thingToPush.layerPosition);
+                //this.hashLayerNumber.setItem(this.hashKey, thingToPush.layerData);
+                this.hashInstance.setItem(this.hashKey, thingToPush.layerData, thingToPush.layerData.layerPosition);
                 this.selectLayer(0);
 
             }
 
             this._LayerUndoObject = thingToPush;
-            this._LayerUndoIndex = thingToPush.layerID;
+            this._LayerUndoIndex = thingToPush.layerData.layerID;
             this._LayerUndoStatus = true;
             }
 
@@ -633,84 +616,79 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     restoreLayer:{
         value:function (ele) {
-            var hashIndex = 0 ,layerResult
+            var hashIndex = 0 ,layerResult;