Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 15 insertions, 50 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 45353a08..b0ab3b19 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1211,54 +1211,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         j = 0,
                         arrLayersLength = this.arrLayers.length,
                         arrSelectedIndexesLength = arrSelectedIndexes.length,
-                        currentLayersSelectedLength = this.currentLayersSelected.length,
-                        boolContinue = false,
                         arrSelectedLayers = false,
                         arrCurrentElementsSelected = [];
-            var matchedValues = 0;
-
-            for(i=0;i<arrSelectedIndexesLength;i++){
-                for(j=0;j<currentLayersSelectedLength;j++){
-
-                    if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){
-                        matchedValues+=1;
-                    }
-                }
-            }
-
-            if(matchedValues === arrSelectedIndexesLength){
-                return;
-            }
-
-                /*
-                 // TODO: this should probably check to see if it actually needs to run.
-
-                                        console.log(arrSelectedIndexes);
-                        console.log(this.currentLayersSelected);
-                // Compare arrSelectedIndexes with this.currentLayersSelected
-                // If the items are the same, we do not need to do anything.
-                if (arrSelectedIndexesLength !== currentLayersSelectedLength) {
-                        // Different length in the arrays, we definitely need to continue.
-                        console.log('diferent length')
-                        boolContinue = true;
-                } else {
-                        // Check each selected index and see if it's in this.currentLayersSelected
-                        // If we find one that isn't, we need to continue
-
-                        for (i = 0; i < arrSelectedIndexesLength; i++) {
-                                console.log('checking for ', arrSelectedIndexes[i]);
-                                        if (this.currentLayersSelected.indexOf(arrSelectedIndexes[i]) === -1) {
-                                                // Ooops, one of them was not found.
-                                                boolContinue = true;
-                                        }
-                        }
-                }
-                if (boolContinue === false) {
-                        console.log('exiting')
-                        return;
-                }
-                */
-                
 
             // Deselect selected layers if they're not in arrSelectedIndexes.
             for (i = 0; i < arrLayersLength; i++) {
@@ -1266,16 +1220,27 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         if (arrSelectedIndexes.indexOf(i) < 0) {
                                                 this.arrLayers[i].layerData.isSelected = false;
                                 this.triggerLayerBinding(i);
+                                
+                                // Check to see if this layer, that we're deselecting, has
+                                // any selected keyframes associated with it.  If it does, deselect them.
+                                for (j = 0; j < this.selectedTweens.length; j++) {
+                                        var currentStageElement;
+                                        if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") {
+                                                currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; 
+                                        } else {
+                                                currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement;
+                                        }
+                                        if (this.arrLayers[i].layerData.stageElement === currentStageElement) {
+                                                this.selectedTweens[j].deselectTween();
+                                                this.selectedTweens.splice(j, 1);
+                                        }
+                                }
                         }
                 }
             }
             if (this.currentLayersSelected !== false) {
                 this.currentLayersSelected = false;
             }
-
-            // Deselect any tweens
-                this.deselectTweens();
-
             
             // If we are actually going to be selecting things, create an empty array to use
             if (arrSelectedIndexesLength > 0) {