diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 8276f878..666b2816 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -4,9 +4,10 @@ | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var Montage = require("montage/core/core").Montage; | 7 | var Montage = require("montage/core/core").Montage, |
8 | var Component = require("montage/ui/component").Component; | 8 | Component = require("montage/ui/component").Component, |
9 | var nj = require("js/lib/NJUtils").NJUtils; | 9 | nj = require("js/lib/NJUtils").NJUtils, |
10 | EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu; | ||
10 | 11 | ||
11 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | 12 | var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { |
12 | 13 | ||
@@ -204,6 +205,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
204 | } | 205 | } |
205 | }, | 206 | }, |
206 | 207 | ||
208 | _easingMenu: { | ||
209 | value: null | ||
210 | }, | ||
211 | easingMenu: { | ||
212 | get: function() { | ||
213 | return this._easingMenu; | ||
214 | }, | ||
215 | set: function(newVal) { | ||
216 | this._easingMenu = newVal; | ||
217 | } | ||
218 | }, | ||
219 | |||
207 | // The index of the last layer that was clicked on | 220 | // The index of the last layer that was clicked on |
208 | // (used for shift-click multiselect) | 221 | // (used for shift-click multiselect) |
209 | _lastLayerClicked : { | 222 | _lastLayerClicked : { |
@@ -481,6 +494,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
481 | boundObjectPropertyPath:"currentSelectedContainer", | 494 | boundObjectPropertyPath:"currentSelectedContainer", |
482 | oneway:true | 495 | oneway:true |
483 | }); | 496 | }); |
497 | |||
498 | // Create the easing menu for future use. | ||
499 | this.easingMenu = EasingMenuPopup; | ||
500 | //this.easingMenu.show(); | ||
484 | 501 | ||
485 | } | 502 | } |
486 | }, | 503 | }, |