diff options
author | Jon Reid | 2012-05-30 09:35:56 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-30 09:35:56 -0700 |
commit | 9253e2ce98d748edd8c3929f113a597923960387 (patch) | |
tree | 061c47f4df587ef0dde2a63f7395299c5c91747c /js/panels/Timeline/Keyframe.reel/Keyframe.js | |
parent | d901a7539cdde3e02c8dc98b3c35e2c58b6f1abe (diff) | |
parent | 41754c04c5c5f3c372dc2b38a122144f8d9e1d18 (diff) | |
download | ninja-9253e2ce98d748edd8c3929f113a597923960387.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.js')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 41eb6ef1..b91027b6 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -42,19 +42,21 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
42 | 42 | ||
43 | draw:{ | 43 | draw:{ |
44 | value:function(){ | 44 | value:function(){ |
45 | this.element.style.left = (this.position - 6) + "px"; | 45 | this.element.style.left = (this.position - 5) + "px"; |
46 | } | 46 | } |
47 | }, | 47 | }, |
48 | 48 | ||
49 | deselectKeyframe:{ | 49 | deselectKeyframe:{ |
50 | value:function(){ | 50 | value:function(){ |
51 | this.element.classList.remove("keyframeSelected"); | 51 | this.element.classList.remove("keyframeSelected"); |
52 | this.element.style.left = (this.position - 5) + "px"; | ||
52 | } | 53 | } |
53 | }, | 54 | }, |
54 | 55 | ||
55 | selectKeyframe:{ | 56 | selectKeyframe:{ |
56 | value:function(){ | 57 | value:function(){ |
57 | this.element.classList.add("keyframeSelected"); | 58 | this.element.classList.add("keyframeSelected"); |
59 | this.element.style.left = (this.position - 6) + "px"; | ||
58 | this.parentComponent.selectTween(); | 60 | this.parentComponent.selectTween(); |
59 | } | 61 | } |
60 | }, | 62 | }, |