2 files changed, 26 insertions, 5 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index f7cd40ca..29bf6eb3 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -98,6 +98,11 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isSelected",
                                         "oneway" : false
                                 },
+                                "isActive" : {
+                                        "boundObject" : {"@" : "repetition1"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.isActive",
+                                        "oneway" : false
+                                },
                                 "isStyleCollapsed" : {
                                         "boundObject" : {"@" : "repetition1"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 9904a563..c21fa22b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -261,8 +261,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         var ptrParent = nj.queryParentSelector(event.target, ".container-layer");
                         if (ptrParent !== false) {
                                 // Why yes, the click was within a layer.  But which one?
-                                var strLabel = ptrParent.querySelector(".label-layer .collapsible-label").innerText,
-                                        myIndex = this.getLayerIndexByName(strLabel);
+                                var myIndex = this.getActiveLayerIndex();
                                 this.selectLayer(myIndex);
                         }
                 }
@@ -353,7 +352,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         thingToPush.isMainCollapsed = true;
                         thingToPush.isPositionCollapsed = true;
                         thingToPush.isTransformCollapsed = true;
-                        thingToPush.isStyleCollapsed = false;
+                        thingToPush.isStyleCollapsed = true;
                         thingToPush.arrLayerStyles = [];
                         thingToPush.element=[];
                         thingToPush.deleted=false;
@@ -790,7 +789,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     selectLayer : {
         value: function(layerIndex) {
                 // Select a layer based on its index.
-                // use layerIndex = "none" to deselect all layers.
+                // use layerIndex = false to deselect all layers.
                 var i = 0,
                         arrLayersLength = this.arrLayers.length;
                         
@@ -804,7 +803,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 }
                 
                 // Next, update this.layerRepetition.selectedIndexes and this.currentLayerSelected.
-                if (layerIndex !== "none") {
+                if (layerIndex !== false) {
                         this.layerRepetition.selectedIndexes = [layerIndex];
                         this.currentLayerSelected = this.arrLayers[layerIndex]
                 } else {
@@ -850,6 +849,23 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 return returnVal;
         }
     },
+    getActiveLayerIndex : {
+        value: function() {
+                // Searches through the layers and looks for one that has
+                // set its isActive flag to true.
+                var i = 0, 
+                        returnVal = false,
+                        arrLayersLength = this.arrLayers.length;
+                
+                for (i = 0; i < arrLayersLength; i++) {
+                        if (this.arrLayers[i].isActive === true) {
+                                returnVal = i;
+                                this.arrLayers[i].isActive = false;
+                        }
+                }
+                return returnVal;
+        }
+    },
 
     insertLayer: {
             value: function() {