diff options
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index 369b270a..89f18f98 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -203,6 +203,10 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
203 | // temp - testing var | 203 | // temp - testing var |
204 | var useAbsolute = true; | 204 | var useAbsolute = true; |
205 | 205 | ||
206 | if(event.detail.type === "cssChange"){ | ||
207 | event.detail.source="cssPanelChange" | ||
208 | } | ||
209 | |||
206 | if (event.detail.source && event.detail.source !== "tween") { | 210 | if (event.detail.source && event.detail.source !== "tween") { |
207 | 211 | ||
208 | if(this.parentComponent.parentComponent.isSubproperty){ | 212 | if(this.parentComponent.parentComponent.isSubproperty){ |
@@ -222,7 +226,7 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
222 | setTweenProperties:{ | 226 | setTweenProperties:{ |
223 | value:function (eventDetail) { | 227 | value:function (eventDetail) { |
224 | 228 | ||
225 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi") { | 229 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi" || eventDetail.source === "cssPanelChange") { |
226 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ | 230 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ |
227 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; | 231 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; |
228 | } | 232 | } |