aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.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/TimelineTrack.reel
parentf8f7754ff19a8d2bc7f66fbaa3feb13082076dc5 (diff)
parent1f8cb3a25745e5eb07bffccb4f5d5958e595e740 (diff)
downloadninja-b51c9448bc187f9bfa3ab39c366657ec2bb9e2fb.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 9276a7df..3db57a3a 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -41,6 +41,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
41 this._tween = newVal; 41 this._tween = newVal;
42 } 42 }
43 }, 43 },
44
45 _isFirstDraw: {
46 value: true
47 },
44 48
45 _isVisible:{ 49 _isVisible:{
46 value: true 50 value: true
@@ -970,7 +974,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
970 value:function () { 974 value:function () {
971 this.createPositionTracks(); 975 this.createPositionTracks();
972 // Register event handler for layer events. 976 // Register event handler for layer events.
973 defaultEventManager.addEventListener("layerEvent", this, false); 977 //defaultEventManager.addEventListener("layerEvent", this, false);
978 this.element.addEventListener("layerEvent", this, false);
974 } 979 }
975 }, 980 },
976 981