aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
diff options
context:
space:
mode:
authorJonathan Duran2012-05-14 23:08:24 -0700
committerJonathan Duran2012-05-14 23:08:24 -0700
commit13ebb58be961e92ba7c109298ef73daa7dea79c7 (patch)
tree262357a452bcf23d407682dd077c0982b576647c /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
parentb38e020fb5e64c7d9a1d42c97393a0a84f9841a8 (diff)
downloadninja-13ebb58be961e92ba7c109298ef73daa7dea79c7.tar.gz
fix keyframe bug when adding keyframes to sub properties
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 03287df9..8d2c1918 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -291,12 +291,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
291 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); 291 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
292 292
293 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); 293 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);
294 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount); 294 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount);
295 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); 295 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both");
296 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear"); 296 //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear");
297 297
298 var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} 100% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} }"; 298 var initRule = "@-webkit-keyframes " + this.animationName + " { 0% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} 100% {" + this.trackEditorProperty + ": " + currentStyleValue + ";} }";
299 console.log(initRule); 299 //console.log(initRule);
300 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule); 300 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(initRule);
301 301
302 this.insertPropTween(tweenEvent.offsetX); 302 this.insertPropTween(tweenEvent.offsetX);