aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 43370a64..31e0b3b6 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -246,6 +246,12 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
246 } 246 }
247 }, 247 },
248 248
249 retrieveStoredStyleTweens:{
250 value:function(){
251
252 }
253 },
254
249 updatePropKeyframeRule:{ 255 updatePropKeyframeRule:{
250 value:function(){ 256 value:function(){
251 // delete the current rule 257 // delete the current rule
@@ -278,14 +284,13 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
278 var currentStyleValue = this.ninjaStylesContoller.getElementStyle(this.animatedElement, this.trackEditorProperty); 284 var currentStyleValue = this.ninjaStylesContoller.getElementStyle(this.animatedElement, this.trackEditorProperty);
279 this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue; 285 this.propTweens[0].tweenData.tweenedProperties[this.trackEditorProperty] = currentStyleValue;
280 286
281
282 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty; 287 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
283 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.animationNamesString; 288 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.animationNamesString;
284 var newAnimationNames = currentAnimationNameString + "," + this.animationName; 289 var newAnimationNames = currentAnimationNameString + "," + this.animationName;
285 var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 290 //var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration");
286 var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration; 291 //var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration;
287 var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count"); 292 //var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count");
288 var newIterationCount = currentIterationCount + ",1"; 293 //var newIterationCount = currentIterationCount + ",1";
289 294
290 this.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames; 295 this.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames;
291 296