aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Keyframe.reel/Keyframe.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-27 09:27:11 -0700
committerKruti Shah2012-06-27 09:27:11 -0700
commit18231c8342e7dac7547842c8a2007ac7ecd046df (patch)
tree257fd3e43f1a3df3159fba1b89d3d959637d5fed /js/panels/Timeline/Keyframe.reel/Keyframe.js
parentd6bffa2450f68bdf9bfff0f4e155778f59f3624a (diff)
parent9cefcd17e5b1943685130553f6a4f62179df8936 (diff)
downloadninja-18231c8342e7dac7547842c8a2007ac7ecd046df.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/Keyframe.reel/Keyframe.js')
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 95a94b36..f7c936f7 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.js
@@ -76,6 +76,9 @@ 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 }
79 82
80 if(this.parentComponent.parentComponent.parentComponent.trackType == "position"){ 83 if(this.parentComponent.parentComponent.parentComponent.trackType == "position"){
81 var tweenID = this.parentComponent.tweenID; 84 var tweenID = this.parentComponent.tweenID;