1 files changed, 19 insertions, 92 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 3c4cfa2e..b3f4318a 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -11,11 +11,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
 
     /* === BEGIN: Models === */
-
-    // Layer models: arrays for the data and repetition,  current layer number,
     _arrLayers:{
         value:[]
     },
+
     arrLayers:{
         get:function () {
             return this._arrLayers;
@@ -28,6 +27,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     _layerRepetition:{
         value:null
     },
+
     layerRepetition:{
         get:function () {
             return this._layerRepetition;
@@ -36,9 +36,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._layerRepetition = newVal;
         }
     },
+
     _currentLayerNumber:{
         value:0
     },
+
     currentLayerNumber:{
         get:function () {
             return this._currentLayerNumber;
@@ -62,11 +64,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:1000
     },
 
-    // Track model
     _arrTracks:{
         serializable:true,
         value:[]
     },
+
     arrTracks:{
         serializable:true,
         get:function () {
@@ -76,10 +78,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this._arrTracks = newVal;
         }
     },
+
     _trackRepetition:{
         serializable:true,
         value:null
     },
+
     trackRepetition:{
         serializable:true,
         get:function () {
@@ -104,11 +108,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _isLayer:{
+        value:false
+    },
+
+    _firstTimeLoaded:{
+        value:true,
+        writable:true
+    },
 
+    _arrLayersNonEmpty:{
+        value:true,
+        writable:true
+    },
     /* === END: Models === */
 
     /* === BEGIN: Draw cycle === */
-
     prepareForDraw:{
         value:function () {
 
@@ -126,20 +141,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _isLayer:{
-        value:false
-    },
-
-    _firstTimeLoaded:{
-        value:true,
-        writable:true
-    },
-
-    _arrLayersNonEmpty:{
-        value:true,
-        writable:true
-    },
-
     willDraw:{
         value:function () {
             if (this._isLayer) {
@@ -148,43 +149,29 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
         }
     },
-
     /* === END: Draw cycle === */
 
     /* === BEGIN: Controllers === */
-
     initTimelineView:{
         value:function () {
-
-            // Get some selectors to make life easier.
             this.layout_tracks = this.element.querySelector(".layout-tracks");
             this.layout_markers = this.element.querySelector(".layout_markers");
 
-            // Add event handlers on the buttons.
             this.newlayer_button.identifier = "addLayer";
             this.newlayer_button.addEventListener("click", this, false);
             this.deletelayer_button.identifier = "deleteLayer";
             this.deletelayer_button.addEventListener("click", this, false);
-
-            // New click listener to handle select/deselect events
             this.timeline_leftpane.addEventListener("click", this.timelineLeftPaneClick.bind(this), false);
-
-            // Simultaneous scrolling of the layer and tracks
             this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
 
-            // Calculate and draw time markers
             this.drawTimeMarkers();
 
-            // Default to one layer for new doc
-//            this.newLayer();
             this._hashKey = "123";
             _firstLayerDraw = false;
             NJevent('newLayer', this._hashKey);
             _firstLayerDraw = true;
             this.selectLayer(0);
-
-            // TODO - add condition for existing doc and parse DOM for top level elements
         }
     },
 
@@ -234,7 +221,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleAddLayerClick:{
         value:function (event) {
-            //event.stopPropagation();
             this._isLayer = true;
             this.needsDraw = true;
         }
@@ -242,7 +228,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleDeleteLayerClick:{
         value:function (event) {
-            //event.stopPropagation();
             this._deleteKeyDown = false;
             if (this.application.ninja.currentSelectedContainer.id === "UserContent") {
                 this._hashKey = "123";
@@ -260,17 +245,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this._firstTimeLoaded = false;
             } else {
                 while (this.arrLayers.pop()) {
-
                 }