aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorJonathan Duran2012-06-18 08:43:21 -0700
committerJonathan Duran2012-06-18 08:43:21 -0700
commitb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (patch)
tree5802f2d8581ee13c1172f0992ace2a66069f287c /js/panels/Timeline/Layer.reel
parentf8f7754ff19a8d2bc7f66fbaa3feb13082076dc5 (diff)
parent1f8cb3a25745e5eb07bffccb4f5d5958e595e740 (diff)
downloadninja-b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js21
1 files changed, 18 insertions, 3 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, {
710 // Set up the event info and dispatch the event 710 // Set up the event info and dispatch the event
711 this.styleCounter += 1; 711 this.styleCounter += 1;
712 // newEvent.styleSelection = mySelection; 712 // newEvent.styleSelection = mySelection;
713 defaultEventManager.dispatchEvent(newEvent); 713 //defaultEventManager.dispatchEvent(newEvent);
714
715 // Dispatch the event to the TimelineTrack component associated with this Layer.
716 var myIndex = this.application.ninja.timeline.getActiveLayerIndex(),
717 arrTracks = document.querySelectorAll('[data-montage-id="track"]');
718
719 if (myIndex !== false) {
720 arrTracks[myIndex].dispatchEvent(newEvent);
721 }
714 } 722 }
715 }, 723 },
716 724
@@ -728,8 +736,15 @@ var Layer = exports.Layer = Montage.create(Component, {
728 newEvent.layerID = this.layerID; 736 newEvent.layerID = this.layerID;
729 newEvent.styleID = this.selectedStyleIndex; 737 newEvent.styleID = this.selectedStyleIndex;
730 newEvent.selectedStyleIndex = this.selectedStyleIndex; 738 newEvent.selectedStyleIndex = this.selectedStyleIndex;
731 defaultEventManager.dispatchEvent(newEvent); 739
732 740 // Dispatch the event to the TimelineTrack component associated with this Layer.
741 var myIndex = this.application.ninja.timeline.getActiveLayerIndex(),
742 arrTracks = document.querySelectorAll('[data-montage-id="track"]');
743
744 if (myIndex !== false) {
745 arrTracks[myIndex].dispatchEvent(newEvent);
746 }
747
733 // Delete the style from the view 748 // Delete the style from the view
734 this.arrLayerStyles.splice(this.selectedStyleIndex, 1); 749 this.arrLayerStyles.splice(this.selectedStyleIndex, 1);
735 750