diff options
author | Jonathan Duran | 2012-05-14 23:51:34 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-14 23:51:34 -0700 |
commit | 4438dae53bb528d94b9f21272f7c240dd546b0a8 (patch) | |
tree | 79c31262d9b8bee25a575a3136753680459ee65b /js/panels/Timeline/PropertyTrack.reel | |
parent | 13ebb58be961e92ba7c109298ef73daa7dea79c7 (diff) | |
download | ninja-4438dae53bb528d94b9f21272f7c240dd546b0a8.tar.gz |
handle more prop types in subgroup keyframe rules
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 8d2c1918..43370a64 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -225,6 +225,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
225 | newTween.tweenData.tweenID = 0; | 225 | newTween.tweenData.tweenID = 0; |
226 | newTween.tweenData.spanPosition = 0; | 226 | newTween.tweenData.spanPosition = 0; |
227 | newTween.tweenData.tweenedProperties = []; | 227 | newTween.tweenData.tweenedProperties = []; |
228 | newTween.tweenData.tweenedProperties[this.trackEditorProperty] = this.ninjaStylesContoller.getElementStyle(this.animatedElement, this.trackEditorProperty); | ||
228 | 229 | ||
229 | this.propTweens.push(newTween); | 230 | this.propTweens.push(newTween); |
230 | 231 | ||
@@ -290,7 +291,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
290 | 291 | ||
291 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); | 292 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); |
292 | 293 | ||
293 | this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); | 294 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); |
294 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount); | 295 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", newIterationCount); |
295 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); | 296 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "both"); |
296 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear"); | 297 | //this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-transition-timing-function", "linear"); |