aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index a38ecb30..d6f34383 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -468,8 +468,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
468 this.ninjaStylesContoller = this.application.ninja.stylesController; 468 this.ninjaStylesContoller = this.application.ninja.stylesController;
469 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 469 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
470 if (selectedIndex !== false) { 470 if (selectedIndex !== false) {
471 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]){ 471 if(this.application.ninja.timeline.arrLayers[selectedIndex].layerData.stageElement){
472 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; 472 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.stageElement;
473 } 473 }
474 } 474 }
475 475
@@ -597,7 +597,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
597 // This needs to move to a keyboard shortcut that is TBD 597 // This needs to move to a keyboard shortcut that is TBD
598 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 598 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
599 if (ev.shiftKey) { 599 if (ev.shiftKey) {
600 if (this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList.length == 1) { 600 //if (this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList.length == 1) {
601 if (this.tweens.length < 1) { 601 if (this.tweens.length < 1) {
602 this.insertTween(0); 602 this.insertTween(0);
603 this.addAnimationRuleToElement(ev); 603 this.addAnimationRuleToElement(ev);
@@ -612,10 +612,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
612 this.updateKeyframeRule(); 612 this.updateKeyframeRule();
613 } 613 }
614 } 614 }
615 } else { 615 //} else {
616 // TEMP error check 616 // TEMP error check
617 console.log("There must be exactly one element in an animated layer."); 617 //console.log("There must be exactly one element in an animated layer.");
618 } 618 //}
619 } 619 }
620 } 620 }
621 }, 621 },
@@ -644,7 +644,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
644 newTween.tweenData = {}; 644 newTween.tweenData = {};
645 645
646 if (clickPos == 0) { 646 if (clickPos == 0) {
647 this.animatedElement = this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0]; 647 this.animatedElement = this.application.ninja.timeline.currentLayerSelected.layerData.stageElement;
648 newTween.tweenData.spanWidth = 0; 648 newTween.tweenData.spanWidth = 0;
649 newTween.tweenData.keyFramePosition = 0; 649 newTween.tweenData.keyFramePosition = 0;
650 newTween.tweenData.keyFrameMillisec = 0; 650 newTween.tweenData.keyFrameMillisec = 0;
@@ -727,7 +727,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
727 727
728 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 728 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
729 this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created=true; 729 this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created=true;
730 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; 730 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.stageElement;
731 if(this.animatedElement!==undefined){ 731 if(this.animatedElement!==undefined){
732 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name"); 732 this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
733 this.animationNamesString = this.animationName; 733 this.animationNamesString = this.animationName;