Timeline: More bug fixes and code cleanup for multiselect.

2 files changed, 10 insertions, 342 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 4a737490..48b2dfdf 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -524,14 +524,6 @@ var Layer = exports.Layer = Montage.create(Component, {
         value: function() {
                 // console.log("Layer.didDraw: Layer "+ this.layerID );
                 if (this._isFirstDraw === true) {
-                        if (this.isSelected === true) {
-                                if (this.application.ninja.currentDocument._uuid === this._docUUID) {
-                                        // Once we're done drawing the first time we need to tell the TimelinePanel if
-                                        // this layer is supposed to be selected.
-                                        //console.log('layerName ' +  this.layerName);
-                                        this.parentComponent.parentComponent.selectedLayerID = this.layerID;
-                                        }
-                        }
                         this._isFirstDraw = false;
                         this.layerData._isFirstDraw = false;
                         
@@ -539,7 +531,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                                         this.mainCollapser.myContent.style.height = "auto";
                                         this.mainCollapser.myContent.classList.remove(this.mainCollapser.collapsedClass);
                                         this.mainCollapser.clicker.classList.remove(this.mainCollapser.collapsedClass);
-
                         }
                         if (this.isPositionCollapsed === false) {
                                         this.positionCollapser.myContent.style.height = "auto";
@@ -553,9 +544,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                         }
                         
                 }
-                
-
-                
         }
     },
         /* End: Draw cycle */
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index ce8174b0..d1f51d16 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -108,37 +108,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-    _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;
-                if (this.currentLayerSelected !== false) {
-                        this.selectLayer(selectIndex, true);
-                }
-                if (this.currentLayersSelected !== false) {
-                        this.selectLayers(this.currentLayersSelected);
-                }
-                if ((this.currentLayersSelected === false) && (this.currentLayerSelected === false)) {
-                        this.selectLayers([]);
-                }
-                
-            }
-        }
-    },
-
     _currentLayersSelected:{
         value:[]
     },
@@ -151,6 +120,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.cacheTimeline();
         }
     },
+    
     // The index of the last layer that was clicked on
     // (used for shift-click multiselect)
     _lastLayerClicked : {
@@ -265,7 +235,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         set:function (value) {
             if (this._breadCrumbContainer !== value) {
                 this._breadCrumbContainer = value;
-                //this.LayerBinding();
             }
         }
     },
@@ -350,17 +319,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         for (i = 0; i < dragLayerIndexesLength; i++) {
                                 var myDraggingLayer = this.arrLayers[this._dragLayerIndexes[i]];
                                 arrDragLayers.push(myDraggingLayer);
+                                // Splice arrLayers
                                 this.arrLayers.splice(this._dragLayerIndexes[i], 1);
                                 this.arrLayers.splice(dropLayerIndex, 0, myDraggingLayer);
                         }
-                                console.log(arrDragLayers);
-                        //this.arrLayers.splice(dropLayerIndex, 0, arrDragLayers);
                         this.layersDragged = arrDragLayers;
-                        console.log(this.layersDragged);
-                        console.log(this.arrLayers);
                         this._layerDroppedInPlace = this.arrLayers[dropLayerIndex];
+                        
+                        // Cache the new info
                         this.cacheTimeline();
                         
+                        // Clear drag and drop variables for future re-use
                         this._dropLayerID = null;
                         this.dragLayerIndexes = [];
                         this._dragLayerIndexes = [];
@@ -370,27 +339,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         // So just in case, set the draw routine to delete the helper.
                         this._deleteHelper = true;
                         this.needsDraw = true;
-
-/*
-                        var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID),
-                                dropLayerIndex = this.getLayerIndexByID(this.dropLayerID),
-                                dragLayer = this.arrLayers[dragLayerIndex];
-                    this.layersDragged.push(dragLayer);
-                    this._layerDroppedInPlace = this.arrLayers[dropLayerIndex];
-
-                        this.arrLayers.splice(dragLayerIndex, 1);
-                        this.arrLayers.splice(dropLayerIndex, 0, dragLayer);
-                        this.cacheTimeline();
-                        
-                        // Clear for future DnD
-                        this._dropLayerID = null;
-                        this._dragLayerID = null;
-                        
-                        // Sometimes, just to be fun, the drop and dragend events don't fire.
-                        // So just in case, set the draw routine to delete the helper.
-                        this._deleteHelper = true;
-                        this.needsDraw = true;
-*/
                 }
         }
     },
@@ -428,6 +376,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value: false
     },
     /* === END: Models === */
+   
     /* === BEGIN: Draw cycle === */
     prepareForDraw:{
         value:function () {
@@ -780,14 +729,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected;
                 this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected;
                 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
-
-
-                //debugger;
-                if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") {
-//                      this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
-                }
-                
-                // TODO: select elements stored in currentElementsSelected.
                 
                 // Are we only showing animated layers?
                                 if (this.application.ninja.currentDocument.boolShowOnlyAnimated) {
@@ -816,7 +757,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.deselectTweens();
 
             // Reset visual appearance
-            // Todo: Maybe this should be stored per document, so we can persist between document switch?
+            // TODO: Maybe playhead position should be stored per document, so we can persist between document switch?
             this.application.ninja.timeline.playhead.style.left = "-2px";
             this.application.ninja.timeline.playheadmarker.style.left = "0px";
             this.application.ninja.timeline.updateTimeText(0.00);