aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJonathan Duran2012-03-16 15:58:23 -0700
committerJonathan Duran2012-03-16 15:58:23 -0700
commit10c58b2ccd93aabb692dbe7e86a88af9446c3c99 (patch)
treef707d26f8ab642b7684bf8761953a8e0406636f7 /js/panels/Timeline
parent6b5cdc7f3b59a70b506b4ac5c8a4d105c90c713c (diff)
downloadninja-10c58b2ccd93aabb692dbe7e86a88af9446c3c99.tar.gz
Cleanup
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
1 files changed, 0 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 827e16c6..8343ed90 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -394,8 +394,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
394 draw:{ 394 draw:{
395 value:function () { 395 value:function () {
396 this.ninjaStylesContoller = this.application.ninja.stylesController; 396 this.ninjaStylesContoller = this.application.ninja.stylesController;
397
398 // animatedElement going away - unneeded below
399 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 397 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
400 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){ 398 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){
401 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; 399 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];
@@ -420,9 +418,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
420 value:function (ev) { 418 value:function (ev) {
421 // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span 419 // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span
422 // This needs to move to a keyboard shortcut that is TBD 420 // This needs to move to a keyboard shortcut that is TBD
423
424 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 421 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
425
426 if (ev.shiftKey) { 422 if (ev.shiftKey) {
427 if (this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList.length == 1) { 423 if (this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList.length == 1) {
428 if (this.tweens.length < 1) { 424 if (this.tweens.length < 1) {