From 134abd9a23c3ef3ef687051b5da7b94339ae8cad Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Thu, 15 Mar 2012 15:59:01 -0700
Subject: Timeline: Remove selection timer on add new layer method.

---
 js/panels/Timeline/Layer.reel/Layer.js                 |  1 +
 js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 069d3c4b..5206ae16 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -260,6 +260,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         		}
         		this._isSelected = value;
         		this.layerData.isSelected = value;
+        		this.needsDraw = true;
         	}
             
         }
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 45a90355..57288395 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -416,7 +416,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             } else {
                 // we do have information stored.  Use it.
                 this._boolCacheArrays = false;
-        		this._captureSelection = true;
         		//var myIndex = 0;
         		for (var i = 0; i < this.application.ninja.currentDocument.tlArrLayers.length; i++) {
         			if ( this.application.ninja.currentDocument.tlArrLayers[i].layerData.isSelected === true ) {
@@ -431,7 +430,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.hashInstance = this.application.ninja.currentDocument.tlLayerHashTable;
                 this.hashElementMapToLayer = this.application.ninja.currentDocument.tlElementHashTable;
                 this.hashKey = this.application.ninja.currentDocument.hashKey;
-                this._boolCacheArrays = true;
+
             }
         }
     },
@@ -687,6 +686,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 	            thingToPush.layerData.layerID = this.currentLayerNumber;
 	            thingToPush.parentElementUUID = this.hashKey;
 	            thingToPush.parentElement = this.application.ninja.currentSelectedContainer;
+	            thingToPush.layerData.isSelected = true;
+	        	thingToPush.layerData._isFirstDraw = true;
+	        	
+	        	for (var i = 0; i < this.arrLayers.length; i++) {
+	        		this.arrLayers[i].layerData.isSelected = false;
+	        		this.arrLayers[i].layerData._isFirstDraw = false;
+	        	}
 	
 	            if (!!this.layerRepetition.selectedIndexes) {
 	            	// There is a selected layer, so we need to splice the new
@@ -712,7 +718,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 	            this._LayerUndoObject = thingToPush;
 	            this._LayerUndoIndex = thingToPush.layerData.layerID;
 	            this._LayerUndoStatus = true;
-
+/*
 	            this._captureSelection = true;
 
 				// TODO: Find a better solution than a timout here.
@@ -720,7 +726,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 	            setTimeout(function() {
 	            	that.selectLayer(indexToSelect, true);
 	            }, 500);
-
+*/
             }
 
         }
@@ -1031,7 +1037,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 }
             }
             
-
             this.layerRepetition.selectedIndexes = [layerIndex];
             this.currentLayerSelected = this.arrLayers[layerIndex];
             if(userSelection){
-- 
cgit v1.2.3