aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js25
1 files changed, 10 insertions, 15 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 8b3938f4..0e40e222 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -321,6 +321,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
321 } 321 }
322 }, 322 },
323 323
324 animationNamesString:{
325 value:""
326 },
327
324 ninjaStylesContoller:{ 328 ninjaStylesContoller:{
325 value:null 329 value:null
326 }, 330 },
@@ -468,14 +472,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
468 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0]; 472 this.animatedElement = this.application.ninja.timeline.arrLayers[selectedIndex].layerData.elementsList[0];
469 } 473 }
470 } 474 }
471 475
472
473
474
475
476
477
478
479 // Drag and Drop: 476 // Drag and Drop:
480 // Do we have a helper to append? 477 // Do we have a helper to append?
481 if (this._appendHelper === true) { 478 if (this._appendHelper === true) {
@@ -527,7 +524,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
527 } 524 }
528 } 525 }
529 526
530
531 if (this._isFirstDraw === true) { 527 if (this._isFirstDraw === true) {
532 528
533 if (this.isMainCollapsed === false) { 529 if (this.isMainCollapsed === false) {
@@ -591,11 +587,10 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
591 587
592 this.tweens[i].tweenData = myObj; 588 this.tweens[i].tweenData = myObj;
593 } 589 }
594
595
596 } 590 }
597 } 591 }
598 }, 592 },
593
599 handleClick:{ 594 handleClick:{
600 value:function (ev) { 595 value:function (ev) {
601 // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span 596 // TEMP - if the SHIFT key is down, add a new keyframe or split an existing span
@@ -609,7 +604,9 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
609 this.updateKeyframeRule(); 604 this.updateKeyframeRule();
610 } else { 605 } else {
611 this.handleNewTween(ev); 606 this.handleNewTween(ev);
612 this.updateKeyframeRule(); 607 if (ev.target.className === "tracklane") {
608 this.updateKeyframeRule();
609 }
613 } 610 }
614 } else { 611 } else {
615 // TEMP error check 612 // TEMP error check
@@ -626,7 +623,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
626 this.application.ninja.timeline.selectLayer(selectedIndex, false); 623 this.application.ninja.timeline.selectLayer(selectedIndex, false);
627 this.insertTween(ev.offsetX); 624 this.insertTween(ev.offsetX);
628 } else { 625 } else {
629 console.log(ev.target);
630 this.splitTween(ev); 626 this.splitTween(ev);
631 } 627 }
632 } 628 }
@@ -792,6 +788,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
792 this.tweens[0].tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft; 788 this.tweens[0].tweenData.tweenedProperties["left"] = this.animatedElement.offsetLeft;
793 var animationDuration = Math.round(this.trackDuration / 1000) + "s"; 789 var animationDuration = Math.round(this.trackDuration / 1000) + "s";
794 this.animationName = this.animatedElement.classList[0] + "_PositionSize"; 790 this.animationName = this.animatedElement.classList[0] + "_PositionSize";
791 this.animationNamesString = this.animationName;
795 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName); 792 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-name", this.animationName);
796 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration); 793 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-duration", animationDuration);
797 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1); 794 this.ninjaStylesContoller.setElementStyle(this.animatedElement, "-webkit-animation-iteration-count", 1);
@@ -900,8 +897,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
900 newStyleTrack.propTrackData.trackEditorProperty = ""; 897 newStyleTrack.propTrackData.trackEditorProperty = "";
901 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; 898 newStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex;
902 899
903 console.log(layerEvent.styleIndex);
904
905 this.arrStyleTracks.push(newStyleTrack); 900 this.arrStyleTracks.push(newStyleTrack);
906 901
907 } else if (layerEvent.layerEventType === "deleteStyle") { 902 } else if (layerEvent.layerEventType === "deleteStyle") {