1 files changed, 23 insertions, 26 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 36c77018..1b8d73c0 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -113,7 +113,18 @@ var Layer = exports.Layer = Montage.create(Component, {
                 this.layerData.layerTag = newVal;
         }
     },
-    
+    _docUUID : {
+        value: null
+    },
+    docUUID : {
+        serializable: true,
+        get: function() {
+                return this._docUUID;
+        },
+        set: function(newVal) {
+                this._docUUID = newVal;
+        }
+    },
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
@@ -471,6 +482,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             this.layerTag = this.layerData.layerTag;
             this.isVisible = this.layerData.isVisible;
             this.isAnimated = this.layerData.isAnimated;
+            this.docUUID = this.layerData.docUUID;
             this.needsDraw = boolNeedsDraw;
         }
     },
@@ -555,10 +567,15 @@ var Layer = exports.Layer = Montage.create(Component, {
     },
     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;
+                if (this._isFirstDraw === true) {
+                        if (this.isSelected === true) {
+                                if (this.application.ninja.currentDocument._uuid === this._docUUID) {
+                                        // Once we're done drawing the first time we need to tell the TimelinePanel if
+                                        // this layer is supposed to be selected.
+                                        //console.log('layerName ' +  this.layerName);
+                                        this.parentComponent.parentComponent.selectedLayerID = this.layerID;
+                                        }
+                        }
                         this._isFirstDraw = false;
                 }
         }
@@ -567,36 +584,16 @@ var Layer = exports.Layer = Montage.create(Component, {
         
         /* Begin: Controllers */
         
-        // Initialize a just-created layer with some basic defaults and needed selectors.
+        // Initialize a just-created layer
         init: {
                 value: function() {
-                        // Default some vars
-                        //this.arrLayerStyles = [];
-                        
                         // Get some selectors.
                 this.label = this.element.querySelector(".label-layer");
                 this.titleSelector = this.label.querySelector(".collapsible-label");
                 this.buttonAddStyle = this.element.querySelector(".button-add");
                 this.buttonDeleteStyle = this.element.querySelector(".button-delete");
-                
-                
-
                 }
         },
-    selectLayer:{
-        value:function(){
-            // this.mainCollapser.header.classList.add("layerSelected");
-            this.element.classList.add("layerSelected");
-            this.isSelected = true;
-        }
-    },
-    deselectLayer:{
-        value:function(){
-            // this.mainCollapser.header.classList.remove("layerSelected");
-            this.element.classList.remove("layerSelected");
-            this.isSelected = false;
-        }
-    },
         addStyle : {
                 value: function() {
                         // Add a new style rule.  It should be added above the currently selected rule,