aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 73c5ff8d..5c957619 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -37,8 +37,7 @@
37 "checkable_relative" : {"#" : "checkable_relative"}, 37 "checkable_relative" : {"#" : "checkable_relative"},
38 "checkable_absolute" : {"#" : "checkable_absolute"}, 38 "checkable_absolute" : {"#" : "checkable_absolute"},
39 "checkable_animated" : {"#" : "checkable_animated"}, 39 "checkable_animated" : {"#" : "checkable_animated"},
40 "tl_configbutton" : {"#" : "tl-configbutton"}, 40 "tl_configbutton" : {"#" : "tl-configbutton"}
41 "easingMenu" : {"@" : "easingMenu"}
42 } 41 }
43 }, 42 },
44 43
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 666b2816..b022bd8a 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -209,6 +209,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
209 value: null 209 value: null
210 }, 210 },
211 easingMenu: { 211 easingMenu: {
212 serializable: true,
212 get: function() { 213 get: function() {
213 return this._easingMenu; 214 return this._easingMenu;
214 }, 215 },