diff options
author | Jonathan Duran | 2012-06-26 12:11:41 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 12:11:41 -0700 |
commit | d9170ea8ac54aa2aefd43de15defb439e65fa1f3 (patch) | |
tree | 0a5ca6a46387798b9d2b2d494fcfb999cbd13f4a /js/panels/Timeline | |
parent | d506220a65f2edf195b3b43aa7dbd47839a7eef7 (diff) | |
download | ninja-d9170ea8ac54aa2aefd43de15defb439e65fa1f3.tar.gz |
Fix sub prop tween selection to select main tween
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Keyframe.reel/Keyframe.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index ba6952aa..95a94b36 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js | |||
@@ -76,9 +76,17 @@ var Keyframe = exports.Keyframe = Montage.create(Component, { | |||
76 | 76 | ||
77 | selectKeyframe:{ | 77 | selectKeyframe:{ |
78 | value:function(){ | 78 | value:function(){ |
79 | |||
80 | if(this.parentComponent.parentComponent.parentComponent.trackType == "position"){ | ||
81 | var tweenID = this.parentComponent.tweenID; | ||
82 | var mainTrack = this.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent; | ||
83 | mainTrack.childComponents[0].childComponents[tweenID].childComponents[0].selectKeyframe(); | ||
84 | return; | ||
85 | } | ||
86 | |||
79 | this.isSelected=true; | 87 | this.isSelected=true; |
80 | this.element.style.left = (this.position - 6) + "px"; | 88 | this.element.style.left = (this.position - 6) + "px"; |
81 | this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty | 89 | this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty; |
82 | this.parentComponent.selectTween(); | 90 | this.parentComponent.selectTween(); |
83 | } | 91 | } |
84 | }, | 92 | }, |