aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Tween.reel/Tween.js
diff options
context:
space:
mode:
authorJonathan Duran2012-07-19 11:58:23 -0700
committerJonathan Duran2012-07-19 11:58:23 -0700
commit7b7f4157dfd1d3ad2b4a266c92594da56a619254 (patch)
tree856f73446068c430cb4e9218aab34f9d8bbd4169 /js/panels/Timeline/Tween.reel/Tween.js
parent6431037185722a63064c2f2fb31fe0e325c9653a (diff)
downloadninja-7b7f4157dfd1d3ad2b4a266c92594da56a619254.tar.gz
Improve keyframe selection by moving playhead marker to lower z-index
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Tween.reel/Tween.js')
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index e3f9e71a..c9b59253 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -377,6 +377,12 @@ var Tween = exports.Tween = Montage.create(Component, {
377 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); 377 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween");
378 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween"); 378 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "width", [currentWidth], "Change", "tween");
379 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween"); 379 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "height", [currentHeight], "Change", "tween");
380
381 if(this.parentComponent.parentComponent.enabled3D){
382 var current3DMatrix = this.tweenedProperties["-webkit-transform"];
383 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "-webkit-transform", [current3DMatrix], "Change", "tween");
384 }
385
380 } 386 }
381 } 387 }
382 }, 388 },