aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-14 14:30:16 -0700
committerJon Reid2012-06-14 14:30:16 -0700
commit0bb16b6a7aa392b9e26eb9787542da9a274c4960 (patch)
tree72cf5f580f32c5f21f573c7812a3a387917ab01e /js/panels/Timeline/TimelinePanel.reel
parent0d080d97141cd08855e14a63fa3fee062663cd7d (diff)
parent53bb51a38edc6fe7cc80c43d34027590a22a1d32 (diff)
downloadninja-0bb16b6a7aa392b9e26eb9787542da9a274c4960.tar.gz
Merge branch 'new-easing-menu' into timeline-local
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html3
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js23
2 files changed, 22 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 5c957619..73c5ff8d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -37,7 +37,8 @@
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"}
41 } 42 }
42 }, 43 },
43 44
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
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage,
8var Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component,
9var nj = require("js/lib/NJUtils").NJUtils; 9 nj = require("js/lib/NJUtils").NJUtils,
10 EasingMenuPopup = require("js/panels/Timeline/EasingMenu.reel").EasingMenu;
10 11
11var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { 12var 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 },