aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js6
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js2
2 files changed, 7 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index d6f34383..0e430000 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -730,7 +730,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
730 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.stageElement; 730 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.stageElement;
731 if(this.animatedElement!==undefined){ 731 if(this.animatedElement!==undefined){
732 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name"); 732 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
733 var animationNameList = this.animationName.split(",");
734 if(animationNameList.length > 1){
735 this.animationName = animationNameList[0];
736 }
737
733 this.animationNamesString = this.animationName; 738 this.animationNamesString = this.animationName;
739
734 if(this.animationName){ 740 if(this.animationName){
735 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 741 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
736 this.nextKeyframe = 0; 742 this.nextKeyframe = 0;
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index b61b0ca9..de6a8d56 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -271,7 +271,7 @@ var Tween = exports.Tween = Montage.create(Component, {
271 // set property specific style on element 271 // set property specific style on element
272 var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty]; 272 var currentValue = this.tweenedProperties[this.parentComponent.parentComponent.trackEditorProperty];
273 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween"); 273 this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], this.parentComponent.parentComponent.trackEditorProperty, [currentValue], "Change", "tween");
274 //console.log(currentValue); 274 console.log(currentValue);
275 } else { 275 } else {
276 // move animated element to correct position on stage 276 // move animated element to correct position on stage
277 var currentTop = this.tweenedProperties["top"] + "px"; 277 var currentTop = this.tweenedProperties["top"] + "px";