Merge branch 'refs/heads/Ninja-Internal' into Color

1 files changed, 393 insertions, 329 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 81415951..087bf3cd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -28,7 +28,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         },
         set:function (newVal) {
             this._arrLayers = newVal;
-            this.application.ninja.currentDocument.tlArrLayers = newVal;
+            this._cacheArrays();
         }
     },
 
@@ -45,6 +45,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _cacheArrays : {
+        value: function() {
+                if (this._boolCacheArrays) {
+                                this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
+
+                }
+        }
+    },
+    
+    // Set to false to skip array caching array sets in current document
+    _boolCacheArrays : {
+        value: true
+    },
+
     _currentLayerNumber:{
         value:0
     },
@@ -56,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();
+            }
+        }
+    },
+
+    _setHashKey:{
+        value:function(){
+            if (this._boolCacheArrays) {
+                this.application.ninja.currentDocument.hashKey = this.hashKey;
+            }
+        }
     },
 
-    currentTrackSelected:{
+    currentLayerSelected:{
         value: null
     },
 
@@ -88,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.application.ninja.currentDocument.tlArrTracks = newVal;
-        }
-    },
-
     _trackRepetition:{
         serializable:true,
         value:null
@@ -147,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
     },
@@ -165,55 +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);
-            }
-        },
-
-    handleOnOpenDocument:{
-        value:function(){
-                this.clearTimelinePanel();
-            this.eventManager.addEventListener("deleteLayerClick", this, false);
-            this.eventManager.addEventListener("newLayer", this, false);
-            this.eventManager.addEventListener("deleteLayer", this, false);
-            this.eventManager.addEventListener("layerBinding", this, false);
-            this.eventManager.addEventListener("elementAdded", this, false);
-            this.eventManager.addEventListener("elementDeleted", this, false);
-            this.eventManager.addEventListener("deleteSelection", this, false);
-            this.eventManager.addEventListener("selectionChange", this, true);
-            this.hashInstance = this.createLayerHashTable();
-            this.hashTrackInstance = this.createTrackHashTable();
-            this.hashLayerNumber = this.createLayerNumberHash();
-            this.hashElementMapToLayer = this.createElementMapToLayer();
-            this.initTimelineView();
-
-
+        value:function () {
+            this.initTimeline();
+            this.eventManager.addEventListener("onOpenDocument", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
+            this.eventManager.addEventListener("switchDocument", this, false);
         }
     },
-    
-    handleCloseDocument: {
-        value: function(event) {
-                this.clearTimelinePanel();
-        }
-    },
-    
-    handleSwitchDocument : {
-        value: function(event) {
-                // Handle document change.
-                this.handleOnOpenDocument();
-        }
-    },
-    
+
     willDraw:{
         value:function () {
             if (this._isLayer) {
@@ -223,8 +232,36 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
     /* === END: Draw cycle === */