From 4338d57eed565f723bfb7cbcefca65836b68953b Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 1 Jun 2012 14:26:30 -0700
Subject: Timeline: Better style selection and deselection. Automatic
 re-selection of previously selected style when parent layer is reselected.

---
 .../Timeline/TimelinePanel.reel/TimelinePanel.js   | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 9f9a747a..bb5ca036 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -919,7 +919,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             for (i = 0; i < arrLayersLength; i++) {
             	if (this.arrLayers[i].layerData.isSelected === true) {
             		if (arrSelectedIndexes.indexOf(i) < 0) {
-            			console.log("TimelinePanel.selectLayers, deselecting ", i);
+
 						this.arrLayers[i].layerData.isSelected = false;
 	            		this.triggerLayerBinding(i);
             		}
@@ -992,7 +992,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     	value: function() {
     		var arrSelectedElements = [],
     			i = 0,
-    			arrLayersLength = this.arrLayers.length;
+    			j = 0,
+    			arrLayersLength = this.arrLayers.length,
+    			boolDoIt = false,
+    			arrSelectedElementsLength = 0,
+    			arrStageIndexes = this.getSelectedLayerIndexesFromStage(),
+    			arrStageIndexesLength = arrStageIndexes.length;
     		
     		// Get the selected layers
     		for (i = 0; i < arrLayersLength; i++) {
@@ -1000,9 +1005,25 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     				arrSelectedElements.push(this.arrLayers[i].layerData.stageElement);
     			}
     		}
+    		arrSelectedElementsLength = arrSelectedElements.length;
+
+			// check to see if we even need to continue...
+    		if (arrSelectedElementsLength !== arrStageIndexesLength) {
+    			boolDoIt = true;
+    		} else {
+    			for (i = 0; i < arrStageIndexesLength; i++) {
+    				if (this.currentLayersSelected.indexOf(arrStageIndexes[i]) < 0) {
+    					boolDoIt = true;
+    				}
+    			}
+    		}
+    		
+    		if (boolDoIt === false) {
+    			return;
+    		}
     		
     		// Select the layers, or clear the selection if none were found
-    		if (arrSelectedElements.length > 0) {
+    		if (arrSelectedElementsLength > 0) {
     			this.application.ninja.selectionController.selectElements(arrSelectedElements);
     		} else {
     			this.application.ninja.selectionController.executeSelectElement();
-- 
cgit v1.2.3