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

Conflicts:
	js/document/html-document.js
	js/helper-classes/3D/draw-utils.js

2 files changed, 242 insertions, 249 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 91277a63..087bf3cd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -49,6 +49,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: function() {
                 if (this._boolCacheArrays) {
                                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
+
                 }
         }
     },
@@ -69,6 +70,39 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         set:function (newVal) {
             if (newVal !== this._currentLayerNumber) {
                 this._currentLayerNumber = newVal;
+                this._setCurrentLayerNumber();
+            }
+        }
+    },
+
+    _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;
             }
         }
     },
@@ -97,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
@@ -156,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
     },
@@ -204,11 +238,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 value: function(boolUnbind) {
                         var arrEvents = ["deleteLayerClick", 
                                                          "newLayer", 
-                                                         "deleteLayer", 
-                                                         "layerBinding",
+                                                         "deleteLayer",
                                                          "elementAdded", 
-                                                         "elementDeleted", 
-                                                         "deleteSelection", 
+                                                         "elementDeleted",
                                                          "selectionChange"],
                                 i,
                                 arrEventsLength = arrEvents.length;
@@ -221,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
+                });
                         }
                 }
         },
@@ -247,8 +284,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:function () {
             var myIndex;
                         this.drawTimeMarkers();
-                        this._hashKey = "123";
-            
+
             // Document switching
                         // Check to see if we have saved timeline information in the currentDocument.
                         if (typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined") {
@@ -257,50 +293,60 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                                 this.application.ninja.currentDocument.isTimelineInitialized = true;