diff options
author | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-24 09:35:17 -0700 |
commit | 9809c96d96c24a512f6da1efbf44f174ca9321fe (patch) | |
tree | fa87aeee120500e57d1077c6c0c01a6cc717e144 /js/panels/Timeline/Keyframe.reel/Keyframe.js | |
parent | 458714f5bf2ab095f6e96dfec3f9ff7042527c04 (diff) | |
parent | a8dff9f5cb9dec84e6805118d49903710b361275 (diff) | |
download | ninja-9809c96d96c24a512f6da1efbf44f174ca9321fe.tar.gz |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.js')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 52302319..41eb6ef1 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -91,6 +91,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
91 | } | 91 | } |
92 | } | 92 | } |
93 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; | 93 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; |
94 | this.selectKeyframe(); | ||
94 | } | 95 | } |
95 | }, | 96 | }, |
96 | handleDragend: { | 97 | handleDragend: { |