1 files changed, 82 insertions, 102 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 767dc362..f6e0e252 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -95,6 +95,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.cacheTimeline();
         }
     },
+    _currentElementsSelected: {
+        value: []
+    },
+    currentElementsSelected: {
+        get: function() {
+                return this._currentElementsSelected;
+        },
+        set: function(newVal) {
+                this._currentElementsSelected = newVal;
+                this.cacheTimeline();
+        }
+    },
 
     _selectedLayerID:{
         value:false
@@ -506,6 +518,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
                         this.application.ninja.currentDocument.tlCurrentLayerSelected = this.currentLayerSelected;
                         this.application.ninja.currentDocument.tlCurrentLayersSelected = this.currentLayersSelected;
+                        this.application.ninja.currentDocument.tlCurrentElementsSelected = this.currentElementsSelected;
                         }
         }
     },
@@ -519,6 +532,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
                 this.application.ninja.currentDocument.tlCurrentLayerSelected = false;
                 this.application.ninja.currentDocument.tlCurrentLayersSelected = false;
+                this.application.ninja.currentDocument.tlCurrentElementsSelected = [];
         }
     },
     
@@ -622,8 +636,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             document.addEventListener("click", this.handleDocumentClick.bind(this), false);
             
             // Add some event handlers
-            //this.timeline_leftpane.addEventListener("mousedown", this.timelineLeftPanelMousedown.bind(this), false);
-            this.timeline_leftpane.addEventListener("click", this.timelineLeftPanelMousedown.bind(this), false);
+            this.timeline_leftpane.addEventListener("mousedown", this.timelineLeftPanelMousedown.bind(this), false);
+            //this.timeline_leftpane.addEventListener("click", this.timelineLeftPanelMousedown.bind(this), false);
             //this.timeline_leftpane.addEventListener("mouseup", this.timelineLeftPaneMouseup.bind(this), false);
             this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
             this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
@@ -708,8 +722,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayerNumber = storedCurrentLayerNumber;
                 boolAlreadyInitialized = true;
                 this.application.ninja.currentDocument.setLevel = false;
-
-
             } else {
                 //console.log('TimelinePanel.initTimelineForDocument: else fallback');
                 // we do have information stored.  Use it.
@@ -729,6 +741,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
                 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected;
                 this.currentLayersSelected = this.application.ninja.currentDocument.tlCurrentLayersSelected;
+                this.currentElementsSelected = this.application.ninja.currentDocument.tlCurrentElementsSelected;
                 this._currentDocumentUuid = this.application.ninja.currentDocument.uuid;
 
 
@@ -737,6 +750,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 //                      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) {
                                         // Fake a click.
@@ -773,6 +788,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.currentLayerNumber = 0;
             this.currentLayerSelected = false;
             this.currentLayersSelected = false;
+            this.currentElementsSelected = [];
             this.selectedKeyframes = [];
             this.selectedTweens = [];
             this._captureSelection = false;
@@ -878,7 +894,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.updateTimeText(currentMillisec);
         }
     },
-
+        
     handleSelectionChange:{
         value:function () {
             var layerIndex, 
@@ -887,7 +903,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 arrLayersLength = this.arrLayers.length,
                 intNumSelected = this.application.ninja.selectedElements.length,
                 checkIndex = 0;
-            
+
             //console.log("TimelinePanel.handleSelectionChange, intNumSelected is ", intNumSelected)
             
             if (intNumSelected === 0) {
@@ -899,30 +915,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 
                 this.currentLayerSelected = false;
                 this.currentLayersSelected = false;
-            }
-
-            if (intNumSelected === 1) {
-                this.currentLayersSelected = false;
-                if (this.application.ninja.selectedElements[0]) {
-                        checkIndex = this.application.ninja.selectedElements[0].uuid;
-                    for (i = 0; i < arrLayersLength; i++) {
-                        var currIndex = this.arrLayers[i].layerData.elementsList[0].uuid,
-                                layerID = this.arrLayers[i].layerData.layerID,
-                                layerIndex = 0;
-                        if (checkIndex === currIndex) {
-                            layerIndex = this.getLayerIndexByID(layerID);
-                            this._captureSelection = false;
-                            this.selectLayer(layerIndex);
-                            this._captureSelection = true;
-                        }
-                    }
-                }
-            }
-            
-            if (intNumSelected > 1) {
+            } else {
                 // Build an array of indexes of selected layers to give to the selectLayers method
                 var arrSelectedIndexes = [];
-                this.currentLayerSelected = false;
+                //this.currentLayerSelected = false;
                 for (i = 0; i < intNumSelected; i++) {
                         var currentCheck = this.application.ninja.selectedElements[i].uuid;
                         //console.log("checking ", currentCheck);
@@ -939,71 +935,71 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
-
-
     selectLayers:{
         value:function (arrSelectedIndexes, userSelection) {
 
             var i = 0,
                 arrLayersLength = this.arrLayers.length,
                 arrSelectedIndexesLength = arrSelectedIndexes.length,
-                arrSelectedLayers = false;
+                arrSelectedLayers = false,
+                arrCurrentElementsSelected = [];
             
-            if (typeof(userSelection) === "undefined") {
+            // Set a default for userSelection if it wasn't passed in the method call.
+                        if (typeof(userSelection) === "undefined") {
                 userSelection = false;
             }
-            
-            console.log(arrSelectedIndexes);
-                        
 
-            if (this.selectedKeyframes) {
+                        // Deselect tweens if necessary.
+            if (this.selectedKeyframes) {       
                 this.deselectTweens();
             }
             
+            // deselect all layers.
             for (i = 0; i < arrLayersLength; i++) {