diff options
author | Kruti Shah | 2012-05-31 10:44:45 -0700 |
---|---|---|
committer | Kruti Shah | 2012-05-31 10:44:45 -0700 |
commit | c350cc1c060fdf17357ddadce024267943784593 (patch) | |
tree | 453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/panels/Timeline/Keyframe.reel/Keyframe.js | |
parent | fdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff) | |
parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
download | ninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz |
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.js')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index a4f957cf..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 - 3) + "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 | }, |
@@ -91,6 +93,7 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
91 | } | 93 | } |
92 | } | 94 | } |
93 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; | 95 | this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex; |
96 | this.selectKeyframe(); | ||
94 | } | 97 | } |
95 | }, | 98 | }, |
96 | handleDragend: { | 99 | handleDragend: { |