3 files changed, 34 insertions, 4 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 4941ff79..0abd97be 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -710,7 +710,15 @@ var Layer = exports.Layer = Montage.create(Component, {
                         // Set up the event info and dispatch the event
             this.styleCounter += 1;
                         // newEvent.styleSelection = mySelection;
-                        defaultEventManager.dispatchEvent(newEvent);
+                        //defaultEventManager.dispatchEvent(newEvent);
+                        
+                        // Dispatch the event to the TimelineTrack component associated with this Layer.
+                        var myIndex = this.application.ninja.timeline.getActiveLayerIndex(),
+                                arrTracks = document.querySelectorAll('[data-montage-id="track"]');
+
+                        if (myIndex !== false) {
+                                arrTracks[myIndex].dispatchEvent(newEvent);
+                        }
                 }
         },
 
@@ -728,8 +736,15 @@ var Layer = exports.Layer = Montage.create(Component, {
                                 newEvent.layerID = this.layerID;
                                 newEvent.styleID = this.selectedStyleIndex;
                                 newEvent.selectedStyleIndex = this.selectedStyleIndex;
-                                defaultEventManager.dispatchEvent(newEvent);
-                                
+
+                                // Dispatch the event to the TimelineTrack component associated with this Layer.
+                                var myIndex = this.application.ninja.timeline.getActiveLayerIndex(),
+                                        arrTracks = document.querySelectorAll('[data-montage-id="track"]');
+        
+                                if (myIndex !== false) {
+                                        arrTracks[myIndex].dispatchEvent(newEvent);
+                                }
+                                        
                                 // Delete the style from the view
                                 this.arrLayerStyles.splice(this.selectedStyleIndex, 1);
                                 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 3d109bc1..27b3537c 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1934,6 +1934,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                         return false;
         }
     },
+
+        getActiveLayerIndex: {
+                value: function() {
+                        var i = 0,
+                                returnVal = false,
+                                arrLayersLength = this.arrLayers.length;
+                        for (i = 0; i < arrLayersLength; i++) {
+                                if (this.arrLayers[i].isSelected === true) {
+                                        returnVal = i;
+                                }
+                        }
+                        return returnVal;
+                }
+        },
     /* === END: Controllers === */
    
     /* === BEGIN: Logging routines === */
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 6e09bb64..3db57a3a 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -974,7 +974,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
         value:function () {
             this.createPositionTracks();
             // Register event handler for layer events.
-            defaultEventManager.addEventListener("layerEvent", this, false);
+            //defaultEventManager.addEventListener("layerEvent", this, false);
+            this.element.addEventListener("layerEvent", this, false);
         }
     },