aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Keyframe.reel
diff options
context:
space:
mode:
authorhwc4872012-06-28 12:17:22 -0700
committerhwc4872012-06-28 12:17:22 -0700
commit230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch)
tree133be243b24260f831252f347ed66f24e2b78136 /js/panels/Timeline/Keyframe.reel
parent22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel')
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js13
1 files changed, 12 insertions, 1 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index ba6952aa..f7c936f7 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -76,9 +76,20 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
76 76
77 selectKeyframe:{ 77 selectKeyframe:{
78 value:function(){ 78 value:function(){
79 if(this.isSelected){
80 return;
81 }
82
83 if(this.parentComponent.parentComponent.parentComponent.trackType == "position"){
84 var tweenID = this.parentComponent.tweenID;
85 var mainTrack = this.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent;
86 mainTrack.childComponents[0].childComponents[tweenID].childComponents[0].selectKeyframe();
87 return;
88 }
89
79 this.isSelected=true; 90 this.isSelected=true;
80 this.element.style.left = (this.position - 6) + "px"; 91 this.element.style.left = (this.position - 6) + "px";
81 this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty 92 this.application.ninja.timeline.selectedStyle = this.parentComponent.parentComponent.parentComponent.trackEditorProperty;
82 this.parentComponent.selectTween(); 93 this.parentComponent.selectTween();
83 } 94 }
84 }, 95 },