From 38aed3f1068dcd06089619f3b5278e01c42b0512 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Tue, 22 May 2012 11:04:57 -0700 Subject: update ease method to distinguish between main animation and prop animations Signed-off-by: Jonathan Duran --- js/panels/Timeline/Tween.reel/Tween.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline/Tween.reel') diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index de6a8d56..2a21c330 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -243,7 +243,12 @@ var Tween = exports.Tween = Montage.create(Component, { value:function(easeType){ // easeTypes - ease, ease-out, ease-in, ease-in-out, linear, cubic-bezier(x1, y1, x2, y2) this.tweenedProperties["-webkit-animation-timing-function"] = easeType; - this.parentComponent.parentComponent.updatePropKeyframeRule(); + if(this.parentComponent.parentComponent.isSubproperty){ + this.parentComponent.parentComponent.updatePropKeyframeRule(); + } else { + this.parentComponent.parentComponent.updateKeyframeRule(); + } + } }, -- cgit v1.2.3 From f92838b6ec33e2eb0f8eb06f3cbc7419f38143a1 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Wed, 23 May 2012 11:43:43 -0700 Subject: Diamond keyframes Signed-off-by: Jonathan Duran --- js/panels/Timeline/Tween.reel/Tween.js | 1 - 1 file changed, 1 deletion(-) (limited to 'js/panels/Timeline/Tween.reel') diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 2a21c330..414c0535 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -248,7 +248,6 @@ var Tween = exports.Tween = Montage.create(Component, { } else { this.parentComponent.parentComponent.updateKeyframeRule(); } - } }, -- cgit v1.2.3 From 003d08198368d93078049ee879aaac4275ac4817 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 24 May 2012 10:49:09 -0700 Subject: collapse fix for restored style layers Signed-off-by: Jonathan Duran --- js/panels/Timeline/Tween.reel/Tween.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'js/panels/Timeline/Tween.reel') diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 414c0535..e5288ad9 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js @@ -195,16 +195,16 @@ var Tween = exports.Tween = Montage.create(Component, { setTweenProperties:{ value:function (eventDetail) { if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ - this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop; + this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; } if(this.parentComponent.parentComponent.animatedElement.offsetLeft != this.tweenedProperties["left"]){ - this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft; + this.tweenedProperties["left"] = this.parentComponent.parentComponent.animatedElement.offsetLeft + "px"; } if (this.parentComponent.parentComponent.animatedElement.offsetWidth != this.tweenedProperties["width"]){ - this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth; + this.tweenedProperties["width"] = this.parentComponent.parentComponent.animatedElement.offsetWidth + "px"; } if (this.parentComponent.parentComponent.animatedElement.offsetHeight != this.tweenedProperties["height"]){ - this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight; + this.tweenedProperties["height"] = this.parentComponent.parentComponent.animatedElement.offsetHeight + "px"; } // tell track to update css rule this.parentComponent.parentComponent.updateKeyframeRule(); @@ -278,10 +278,10 @@ var Tween = exports.Tween = Montage.create(Component, { console.log(currentValue); } else { // move animated element to correct position on stage - var currentTop = this.tweenedProperties["top"] + "px"; - var currentLeft = this.tweenedProperties["left"] + "px"; - var currentWidth = this.tweenedProperties["width"] + "px"; - var currentHeight = this.tweenedProperties["height"] + "px"; + var currentTop = this.tweenedProperties["top"]; + var currentLeft = this.tweenedProperties["left"]; + var currentWidth = this.tweenedProperties["width"]; + var currentHeight = this.tweenedProperties["height"]; this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "top", [currentTop], "Change", "tween"); this.application.ninja.elementMediator.setProperty([this.parentComponent.parentComponent.animatedElement], "left", [currentLeft], "Change", "tween"); -- cgit v1.2.3