1 files changed, 285 insertions, 430 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a1e320c4..191228af 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,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _cacheArrays : {
-        value: function() {
+    _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
+    _boolCacheArrays:{
+        value:true
     },
 
     _currentLayerNumber:{
@@ -95,16 +94,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setCurrentLayerNumber:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
             }
         }
     },
 
+    // TODO - Remove hash tables
     _hashKey:{
-            value:0
-        },
+        value:0
+    },
 
     hashKey:{
         get:function () {
@@ -119,46 +119,47 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _setHashKey:{
-        value:function(){
+        value:function () {
             if (this._boolCacheArrays) {
                 this.application.ninja.currentDocument.hashKey = this.hashKey;
             }
         }
     },
 
+
     _currentLayerSelected:{
-        value: null
+        value:null
     },
-    currentLayerSelected : {
-        get: function() {
-                return this._currentLayerSelected;
-        },
-        set: function(newVal) {
-                this._currentLayerSelected = newVal;
-                this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
-        }
+    currentLayerSelected:{
+        get:function () {
+            return this._currentLayerSelected;
+        },
+        set:function (newVal) {
+            this._currentLayerSelected = newVal;
+            this.application.ninja.currentDocument.tlCurrentLayerSelected = newVal;
+        }
     },
 
     _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);
-                }
-        }
+        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);
+            }
+        }
     },
 
     millisecondsOffset:{
@@ -166,16 +167,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _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 +226,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     _breadCrumbContainer:{
-            value:null
-            },
+        value:null
+    },
 
-    breadCrumbContainer: {
-        set: function(value) {
-            if(this._breadCrumbContainer !== value) {
+    breadCrumbContainer:{
+        get:function () {
+            return this._breadCrumbContainer;
+        },
+        set:function (value) {
+            if (this._breadCrumbContainer !== value) {
                 this._breadCrumbContainer = value;
                 this.LayerBinding(this.application.ninja.currentSelectedContainer);
             }