Fix animation names breaking

Signed-off-by: Jonathan Duran <jduran@motorola.com>

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, {
 
             this.animationName = this.animatedElement.classList[0] + "_" + this.trackEditorProperty;
             var currentAnimationNameString = this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString;
-            var newAnimationNames = currentAnimationNameString + "," + this.animationName;
+            var newAnimationNames = "";
+            if(currentAnimationNameString.length == 0){
+                newAnimationNames = this.animationName;
+            } else {
+                newAnimationNames = currentAnimationNameString + "," + this.animationName;
+            }
             var currentAnimationDuration = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-duration");
             var newAnimationDuration = currentAnimationDuration + "," + currentAnimationDuration;
             var currentIterationCount = this.ninjaStylesContoller.getElementStyle(this.animatedElement, "-webkit-animation-iteration-count");
             var newIterationCount = currentIterationCount + ",1";
 
-            this.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames;
+            this.parentComponent.parentComponent.parentComponent.parentComponent.animationNamesString = newAnimationNames;
 
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", newAnimationNames);
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", newAnimationDuration);