7 files changed, 111 insertions, 54 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index db4ad712..4da1bfba 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -85,10 +85,12 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._selectedStyleIndex) {
                         this._selectedStyleIndex = newVal;
                         this.layerData.selectedStyleIndex = newVal;
-                        this.needsDraw = true;
                 }
         }
     },
+    _storedStyleIndex : {
+        value: false
+    },
 
     /* Layer models: the name, ID, and selected and animation booleans for the layer */
     _layerName:{
@@ -276,6 +278,10 @@ var Layer = exports.Layer = Montage.create(Component, {
                         if (value === false) {
                                 // If changing from true to false, we need to deselect any associated styles
                                 this.selectStyle(false);
+                        } else {
+                            if (this._storedStyleIndex !== false) {
+                                this.selectStyle(this._storedStyleIndex);
+                            }
                         }
                         this._isSelected = value;
                         this.layerData.isSelected = value;
@@ -540,7 +546,7 @@ var Layer = exports.Layer = Montage.create(Component, {
             }
             // Enable or disable the delete style button as appropriate
             if (this.isSelected) {
-                if (this.selectedStyleIndex !== "false") {
+                if (this.selectedStyleIndex !== false) {
                         this.selectStyle(this.selectedStyleIndex);
                         this.buttonDeleteStyle.classList.remove("disabled");
                 }
@@ -629,6 +635,7 @@ var Layer = exports.Layer = Montage.create(Component, {
                         newStyle.ruleTweener = false;
                         newStyle.isSelected = false;
             this.arrLayerStyles.push(newStyle);
+            this.selectStyle(this.arrLayerStyles.length -1);
 
                         // Set up the event info and dispatch the event
             this.styleCounter += 1;
@@ -638,56 +645,64 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         deleteStyle : {
                 value: function() {
-                        var newEvent = document.createEvent("CustomEvent"),
-                                selectedIndex = 0;
-                        if (this.arrLayerStyles.length > 0) {
-                                if (!!this.styleRepetition.selectedIndexes) {
-                                        
-                                        selectedIndex = this.styleRepetition.selectedIndexes[0];
+                
+                        // Only delete a style if we have one or more styles, and one of them is selected
+                        if ((this.arrLayerStyles.length > 0) && (this.selectedStyleIndex !== false)) {
+                                var newEvent = document.createEvent("CustomEvent");
 
-                                        // Set up the event info and dispatch the event
-                                        newEvent.initCustomEvent("layerEvent", false, true);
-                                        newEvent.layerEventLocale = "styles";
-                                        newEvent.layerEventType = "deleteStyle";
-                                        newEvent.layerID = this.layerID;
-                                        newEvent.styleID = this.arrLayerStyles[selectedIndex].styleID;
-                                        newEvent.styleSelection = selectedIndex;
-                                        defaultEventManager.dispatchEvent(newEvent);
-                                        
-                                        // Delete the style from the view
-                                        this.arrLayerStyles.splice(selectedIndex, 1);
-                                        
-                                        // Was that the last style?
-                                        if (this.arrLayerStyles.length === 0) {
-                                                this.buttonDeleteStyle.classList.add("disabled");
-                                        }
-                                        
-                                }
-                        }
+                                // Set up the event info and dispatch the event
+                                newEvent.initCustomEvent("layerEvent", false, true);
+                                newEvent.layerEventLocale = "styles";
+                                newEvent.layerEventType = "deleteStyle";
+                                newEvent.layerID = this.layerID;
+                                newEvent.styleID = this.selectedStyleIndex;
+                                newEvent.selectedStyleIndex = this.selectedStyleIndex;
+                                defaultEventManager.dispatchEvent(newEvent);
+                                
+                                // Delete the style from the view
+                                this.arrLayerStyles.splice(this.selectedStyleIndex, 1);
+                                
+                                // Set selection to none
+                                this.selectedStyleIndex = false;
+                                
+                                // Disable the delete style button, because now nothing is selected
+                                this.buttonDeleteStyle.classList.add("disabled");
+                        }       
                 }
         },
         selectStyle : {
                 value: function(styleIndex) {
-                        //console.log("Layer.selectStyle ", styleIndex);
-
                 // Select a style based on its index.
                 // use layerIndex = false to deselect all styles.
                 var i = 0,
                         arrLayerStylesLength = this.arrLayerStyles.length;
                         
-
-                // First, update this.arrStyles[].isSelected
-                for (i = 0; i < arrLayerStylesLength; i++) {
-                        if (i === styleIndex) {
-                                this.arrLayerStyles[i].isSelected = true;
-                        } else {
-                                if (this.arrLayerStyles[i].isSelected === true) {
-                                        this.arrLayerStyles[i].isSelected = false;
-                                }
-                        }
-                }
-                
-
+            if (styleIndex === false) {
+                if (arrLayerStylesLength === 0) {
+                    // No styles selected, so do nothing.
+                    return;
+                }
+                for (i = 0; i < arrLayerStylesLength; i++) {
+                    if (this.arrLayerStyles[i].isSelected === true) {
+                        this.arrLayerStyles[i].isSelected = false;
+                    }
+                }
+            } else {
+                for (i = 0; i < arrLayerStylesLength; i++) {
+                    if (i === styleIndex) {
+                        this.arrLayerStyles[i].isSelected = true;
+                    } else {
+                        if (this.arrLayerStyles[i].isSelected === true) {
+                            this.arrLayerStyles[i].isSelected = false;
+                        }
+                    }
+                }
+                this.selectedStyleIndex = styleIndex;
+                this._storedStyleIndex = styleIndex;
+            }
+            
+            
+            
                 /*
                 // Next, update this.styleRepetition.selectedIndexes.
                 if (styleIndex !== false) {
@@ -746,6 +761,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         handleDeleteStyleClick: {
                 value: function(event) {
+                    if (event.target.classList.contains("disabled")) {
+                        return;
+                    }
                         this.deleteStyle();
                 }
         },
@@ -771,7 +789,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         handleMousedown: {
                 value: function(event) {
-                        //console.log("Layer.handleMousedown")
+                        if (event.target.classList.contains("button-delete")) {
+                                return;
+                        }
                         this.layerData.isActive = true;
                         var ptrParent = nj.queryParentSelector(event.target, ".content-style"),
                                 activeStyleIndex = this.getActiveStyleIndex();
@@ -783,7 +803,6 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         handleLayerClick : {
                 value: function(event) {
-                        //console.log("Layer.handleLayerClick")
                         var ptrParent = nj.queryParentSelector(event.target, ".content-style");
                         if (ptrParent !== false) {
                                 var myIndex = this.getActiveStyleIndex();
diff --git a/js/panels/Timeline/Layer.reel/scss/Layer.scss b/js/panels/Timeline/Layer.reel/scss/Layer.scss
index 8f8881dd..5220d0f1 100644
--- a/js/panels/Timeline/Layer.reel/scss/Layer.scss
+++ b/js/panels/Timeline/Layer.reel/scss/Layer.scss
@@ -274,10 +274,10 @@
 .content-style .item-template {
         display: none;
 }
+.style-row {
+        height: 20px;
+}
 .content-style .layout-row.selected .layout-cell {
         background-color: $color-panel-hilite-bg;
         color: $color-panel-hilite-text;
 }
-.style-row {
-        height: 20px;
-}
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index d712f2bd..5c1c9eeb 100644
--- a/js/panels/Timeline/