1 files changed, 645 insertions, 623 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 033d0f79..39d1ffc6 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -19,12 +19,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     /* === BEGIN: Models === */
     _arrLayers:{
-        serializable: true,
+        serializable:true,
         value:[]
     },
 
     arrLayers:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._arrLayers;
         },
@@ -50,12 +50,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
 
     _layerRepetition:{
-        serializable: true,
+        serializable:true,
         value:null
     },
 
     layerRepetition:{
-        serializable: true,
+        serializable:true,
         get:function () {
             return this._layerRepetition;
         },
@@ -64,18 +64,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _cacheArrays : {
-        value: function() {
+    _cacheArrays:{
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
-
+                this.application.ninja.currentDocument.tlCurrentSelectedContainer=this.application.ninja.currentSelectedContainer;
             }
         }
     },
-    
+
     // Set to false to skip array caching array sets in current document
-    _boolCacheArrays : {
-        value: true
+    _boolCacheArrays:{
+        value:true
     },
 
     _currentLayerNumber:{
@@ -95,87 +95,86 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setCurrentLayerNumber:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
             }
         }
     },
 
-    _hashKey:{
-            value:0
+    _currentLayerSelected:{
+        value:null
+    },
+    currentLayerSelected:{
+        get:function () {
+            return this._currentLayerSelected;
         },
+        set:function (newVal) {
+            this._currentLayerSelected = newVal;
+            this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
+        }
+    },
 
-    hashKey:{
+    _selectedLayerID:{
+        value:false
+    },
+    selectedLayerID:{
         get:function () {
-            return this._hashKey;
+            return this._selectedLayerID;
         },
         set:function (newVal) {
-            if (newVal !== this._hashKey) {
-                this._hashKey = newVal;
-                this._setHashKey();
+            if (newVal === false) {
+                // We are clearing the timeline, so just set the value and return.
+                this._selectedLayerID = newVal;
+                return;
+            }
+            if (newVal !== this._selectedLayerID) {
+                var selectIndex = this.getLayerIndexByID(newVal);
+                this._selectedLayerID = newVal;
+                this._captureSelection = true;
+                this.selectLayer(selectIndex);
             }
         }
     },
 
-    _setHashKey:{
-        value:function(){
-            if (this._boolCacheArrays) {
-                this.application.ninja.currentDocument.hashKey = this.hashKey;
-            }
-        }
+    _millisecondsOffset:{
+        value:1000
     },
 
-    _currentLayerSelected:{
-        value: null
+    millisecondsOffset:{
+        get:function () {
+            return this._millisecondsOffset;
     },
-    currentLayerSelected : {
-        get: function() {
-                return this._currentLayerSelected;
-        },
-        set: function(newVal) {
-                this._currentLayerSelected = newVal;
-                this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
-        }
+        set:function (newVal) {
+            if (newVal !== this._millisecondsOffset) {
+                this._millisecondsOffset= newVal;
+                this.drawTimeMarkers();
+                NJevent('tlZoomSlider',this);
+            }
+        }
     },
 
-    _selectedLayerID:{
-        value: false
-    },
-    selectedLayerID : {
-        get: function() {
-                return this._selectedLayerID;
-        },
-        set: function(newVal) {
-                if (newVal === false) {
-                        // We are clearing the timeline, so just set the value and return.
-                        this._selectedLayerID = newVal;
-                        return;
-                }
-                if (newVal !== this._selectedLayerID) {
-                        var selectIndex = this.getLayerIndexByID(newVal);
-                        this._selectedLayerID = newVal;
-                                this._captureSelection = true;
-                                this.selectLayer(selectIndex, true);
-                }
-        }
+    tweenarray:{
+            value:[],
+            writable:true
     },
 
-    millisecondsOffset:{
-        value:1000
+    tempArray:{
+        value:[],
+        writable:true
     },
 
     _masterDuration:{
-        serializable: true,
+        serializable:true,
         value:0
     },
 
     masterDuration:{
         serializable:true,
-        get:function(){
+        get:function () {
             return this._masterDuration;
         },
-        set:function(val){
+        set:function (val) {
             this._masterDuration = val;
             this.timebar.style.width = (this._masterDuration / 12) + "px";
         }
@@ -225,18 +224,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _breadCrumbContainer:{