1 files changed, 263 insertions, 297 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 59306705..087bf3cd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -44,14 +44,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._layerRepetition = newVal;
         }
     },
+
     _cacheArrays : {
         value: function() {
-                // Cache this.arrLayers and this.arrTracks.
-                this.log('cacheArrays ' + this._boolCacheArrays)
                 if (this._boolCacheArrays) {
-                        this.log('caching arrays for ', this.application.ninja.currentDocument.name);
                                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-                                this.application.ninja.currentDocument.tlArrTracks = this.arrTracks;
+
                 }
         }
     },
@@ -72,15 +70,44 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._currentLayerNumber) {
                 this._currentLayerNumber = newVal;
+                this._setCurrentLayerNumber();
             }
         }
     },
 
-    currentLayerSelected:{
-        value: null
+    _setCurrentLayerNumber:{
+        value:function(){
+            if (this._boolCacheArrays) {
+                this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
+            }
+        }
+    },
+
+    _hashKey:{
+            value:0
+        },
+
+    hashKey:{
+        get:function () {
+            return this._hashKey;
+        },
+        set:function (newVal) {
+            if (newVal !== this._hashKey) {
+                this._hashKey = newVal;
+                this._setHashKey();
+            }
+        }
     },
 
-    currentTrackSelected:{
+    _setHashKey:{
+        value:function(){
+            if (this._boolCacheArrays) {
+                this.application.ninja.currentDocument.hashKey = this.hashKey;
+            }
+        }
+    },
+
+    currentLayerSelected:{
         value: null
     },
 
@@ -104,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
@@ -163,6 +174,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _breadCrumbContainer:{
+            value:null
+            },
+
+    breadCrumbContainer: {
+        set: function(value) {
+            if(this._breadCrumbContainer !== value) {
+                this._breadCrumbContainer = value;
+                this.LayerBinding(this.application.ninja.currentSelectedContainer);
+            }
+        },
+        get: function() {
+            return this._breadCrumbContainer;
+        }
+    },
+
     _isLayer:{
         value:false
     },
@@ -181,22 +208,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:false,
         writable:true
     },
+
     timeMarkerHolder:{
         value: null
     },
     /* === END: Models === */
-
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
-            value:function () {
-                this.initTimeline();
-                this.eventManager.addEventListener("onOpenDocument", this, false);
-                this.eventManager.addEventListener("closeDocument", this, false);
-                this.eventManager.addEventListener("switchDocument", this, false);
-            }
-        },
+        value:function () {
+            this.initTimeline();
+            this.eventManager.addEventListener("onOpenDocument", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
+        }
+    },
 
-    
     willDraw:{
         value:function () {
             if (this._isLayer) {
@@ -206,19 +232,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
     /* === END: Draw cycle === */
-
     /* === BEGIN: Controllers === */
-        
         // Bind all document-specific events (pass in true to unbind)
         _bindDocumentEvents : {
                 value: function(boolUnbind) {
                         var arrEvents = ["deleteLayerClick", 
                                                          "newLayer", 
-                                                         "deleteLayer", 
-                                                         "layerBinding",
+                                                         "deleteLayer",
                                                          "elementAdded", 
-                                                         "elementDeleted", 
-                                                         "deleteSelection", 
+                                                         "elementDeleted",
                                                          "selectionChange"],
                                 i,
                                 arrEventsLength = arrEvents.length;
@@ -231,6 +253,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 for (i = 0; i < arrEventsLength; i++) {
                                         this.eventManager.addEventListener(arrEvents[i], this, false);
                                 }
+                Object.defineBinding(this, "breadCrumbContainer", {
+                    boundObject: this.application.ninja,
+                    boundObjectPropertyPath:"currentSelectedContainer",
+                    oneway: true
+                });
                         }
                 }
         },
@@ -257,9 +284,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             var myIndex;
                         this.drawTimeMarkers();
-                        this._hashKey = "123";
-            
-            
+
             // Document switching