aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
diff options
context:
space:
mode:
authorKruti Shah2012-06-27 12:42:02 -0700
committerKruti Shah2012-06-27 12:42:02 -0700
commitefdca7dd7aa521e03f5d34348bcf250ccb8505c5 (patch)
tree2a08d2929f2577cbc08258c490d93d23037dfef9 /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
parent37fd59d6574b4230df5ff8022e300d8d310c380d (diff)
parent50fba97d221041660f0757725ee46b3a6ceb3aa0 (diff)
downloadninja-efdca7dd7aa521e03f5d34348bcf250ccb8505c5.tar.gz
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 31ba8253..72d26e78 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -470,13 +470,18 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
470 470
471 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty; 471 this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
472 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString; 472 var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString;
473 var newAnimationNames = currentAnimationNameString + "," + this.animationName; 473 var newAnimationNames = "";
474 if(currentAnimationNameString.length == 0){
475 newAnimationNames = this.animationName;
476 } else {
477 newAnimationNames = currentAnimationNameString + "," + this.animationName;
478 }
474 var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 479 var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration");
475 var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration; 480 var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration;
476 var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count"); 481 var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count");
477 var newIterationCount = currentIterationCount + ",1"; 482 var newIterationCount = currentIterationCount + ",1";
478 483
479 this.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames; 484 this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames;
480 485
481 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames); 486 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
482 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration); 487 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);