From 4afb5b8c94bbdd00821abf93ce6599bade360a8f Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 15 Mar 2012 15:13:56 -0700
Subject: Timeline: Fix for layer selection problems on file open and switch.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b41680be..069d3c4b 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -255,12 +255,11 @@ var Layer = exports.Layer = Montage.create(Component, {
         	if (value !== this._isSelected) {
         		// Only concerned about different values
         		if (value === false) {
-        			// If changing from false to true, we need to deselect any associated styles
+        			// If changing from true to false, we need to deselect any associated styles
         			this.selectStyle(false);
         		}
         		this._isSelected = value;
         		this.layerData.isSelected = value;
-        		//this.needsDraw = true;
         	}
             
         }
@@ -381,7 +380,6 @@ var Layer = exports.Layer = Montage.create(Component, {
     		return this._bypassAnimation;
     	},
     	set: function(newVal) {
-    		//console.log("layer.js _bypassAnimation setter " + newVal)
     		this._bypassAnimation = newVal;
     	}
     },
@@ -406,7 +404,6 @@ var Layer = exports.Layer = Montage.create(Component, {
 
     setData:{
         value:function(){
-        	this.log('layer: setData called')
             this.layerName = this.layerData.layerName;
             this.layerID = this.layerData.layerID;
             this.arrLayerStyles = this.layerData.arrLayerStyles;
@@ -424,9 +421,13 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.dtextScaleX = this.layerData.dtextScaleX;
             this.dtextScaleY = this.layerData.dtextScaleY;
             this.dtextRotate = this.layerData.dtextRotate;
+            this._isFirstDraw = this.layerData._isFirstDraw;
             this.needsDraw = true;
         }
     },
+    _isFirstDraw : {
+    	value: true
+    },
 
 	/* END: Models */
 
@@ -482,6 +483,16 @@ var Layer = exports.Layer = Montage.create(Component, {
             	this.element.classList.remove("selected");
             }
     	}
+    },
+    didDraw: {
+    	value: function() {
+    		if ((this.isSelected === true) && (this._isFirstDraw === true)) {
+    			// Once we're done drawing the first time we need to tell the TimelinePanel if
+    			// this layer is supposed to be selected.
+    			this.parentComponent.parentComponent.selectedLayerID = this.layerID;
+    			this._isFirstDraw = false;
+    		}
+    	}
     },
 	/* End: Draw cycle */
 	
-- 
cgit v1.2.3


From 47c7ba7a500082af0268b39ebbbbe926fa284920 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Thu, 15 Mar 2012 16:02:22 -0700
Subject: Timeline: remove comment.

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/panels/Timeline/Layer.reel/Layer.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;
         	}
             
         }
-- 
cgit v1.2.3