From 8e3e8fce5d052ea69c6a4e26b63d3f443e7907d3 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Mon, 25 Jun 2012 16:08:46 -0700 Subject: Timeline: Bug fix IKNINJA-1812, "Easing option switches to None automatically when moving a keyframe" --- js/panels/Timeline/Span.reel/Span.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'js/panels/Timeline') diff --git a/js/panels/Timeline/Span.reel/Span.js b/js/panels/Timeline/Span.reel/Span.js index 91ce1cfb..3c491a53 100644 --- a/js/panels/Timeline/Span.reel/Span.js +++ b/js/panels/Timeline/Span.reel/Span.js @@ -71,6 +71,8 @@ var Span = exports.Span = Montage.create(Component, { newVal = "none"; } this._easing = newVal; + this.parentComponent.easing = this.easing; + this.parentComponent.tweenData.easing = this.easing; this.parentComponent.setKeyframeEase(newVal); this.needsDraw = true; } @@ -180,7 +182,7 @@ var Span = exports.Span = Montage.create(Component, { handleEasingChoicesClick: { value: function(event) { event.stopPropagation(); - + // Remove the pointer to ourselves //this.application.ninja.timeline.currentOpenSpanMenu = false; @@ -190,6 +192,8 @@ var Span = exports.Span = Montage.create(Component, { // Set the easing this.easing = event.target.dataset.ninjaEase; + this.parentComponent.easing = this.easing; + this.parentComponent.tweenData.easing = this.easing; // Unbind the event handler this.application.ninja.timeline.easingMenu.popup.contentEl.removeEventListener("click"); -- cgit v1.2.3