3 files changed, 14 insertions, 5 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);
diff --git a/js/panels/Timeline/Style.reel/Style.html b/js/panels/Timeline/Style.reel/Style.html
index f141fc1c..48ff7c8e 100644
--- a/js/panels/Timeline/Style.reel/Style.html
+++ b/js/panels/Timeline/Style.reel/Style.html
@@ -58,7 +58,7 @@
                                 "value" : {
                                         "boundObject" : {"@" : "owner"},
                                         "boundObjectPropertyPath" : "editorProperty",
-                                        "oneway" : false
+                                        "oneway" : true
                                 }
                         }
                     }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 014d3f34..26ce526f 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -1063,8 +1063,12 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.tweens[0].tweenData.tweenedProperties["height"] = this.animatedElement.offsetHeight + "px";
             var animationDuration = Math.round(this.trackDuration / 1000) + "s";
             this.animationName = this.animatedElement.classList[0] + "_PositionSize";
-            this.animationNamesString = this.animationName;
-            this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName);
+            if(this.animationNamesString.length == 0){
+                this.animationNamesString = this.animationName;
+            } else {
+                this.animationNamesString = this.animationName + ", " + this.animationNamesString;
+            }
+            this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationNamesString);
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration);
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-fill-mode", "forwards");
             this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1);