Merge branch 'refs/heads/ninja-internal' into ToolFixes

2 files changed, 407 insertions, 334 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 1aa9a725..ae1bcddf 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,8 +32,7 @@
                         "timetext" : {"#": "time_text"},
                         "timebar" : {"#": "time_bar"},
                         "container_tracks" : {"#" : "container-tracks"},
-                        "end_hottext" : {"@" : "endHottext"},
-                        "getme" : {"#" : "getme"}
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -117,6 +116,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
                                 },
+                                "bypassAnimation" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
+                                        "oneway" : false
+                                },
                                 "dtextPositionX" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.dtextPositionX",
@@ -165,7 +169,7 @@
                         "bindings": {
                             "objects": {
                                 "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "arrTracks",
+                                "boundObjectPropertyPath": "arrLayers",
                                 "oneway": false
                             }
                         }
@@ -179,7 +183,7 @@
                         "bindings" : {
                                 "trackID" : {
                                         "boundObject" : {"@" : "repetition2"},
-                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.trackID",
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.layerID",
                                         "oneway" : false
                                 },
                                 "tweens" : {
@@ -232,6 +236,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isTransformCollapsed",
                                         "oneway" : false
                                 },
+                                "bypassAnimation" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.bypassAnimation",
+                                        "oneway" : false
+                                },
                                 "isStyleCollapsed" : {
                                         "boundObject" : {"@" : "repetition2"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
@@ -285,7 +294,7 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div id="getme">Master Layer</div>
+                                <div>Master Layer</div>
                             </div>
                             <div id="container-layers">
                                 <div id="container-layer"></div>
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: {