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.js14
1 files changed, 5 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 075290c7..8dc19958 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -453,11 +453,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
453 453
454 triggerOutgoingBinding : { 454 triggerOutgoingBinding : {
455 value: function() { 455 value: function() {
456 if (this.trackData.triggerBinding === true) { 456 this.trackData.triggerBinding = !this.trackData.triggerBinding;
457 this.trackData.triggerBinding = false;
458 } else {
459 this.trackData.triggerBinding = true;
460 }
461 } 457 }
462 }, 458 },
463 459
@@ -527,7 +523,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
527 didDraw:{ 523 didDraw:{
528 value:function () { 524 value:function () {
529 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { 525 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) {
530 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 526 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
531 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 527 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
532 if (selectedIndex !== false) { 528 if (selectedIndex !== false) {
533 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { 529 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
@@ -688,7 +684,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
688 this.nextKeyframe += 1; 684 this.nextKeyframe += 1;
689 } 685 }
690 686
691 this.application.ninja.documentController.activeDocument.needsSave = true; 687 this.application.ninja.documentController.activeDocument.model.needsSave = true;
692 } 688 }
693 }, 689 },
694 690
@@ -759,7 +755,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
759 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 755 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
760 this.nextKeyframe = 0; 756 this.nextKeyframe = 0;
761 757
762 this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document); 758 this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document);
763 759
764 for (i =0; this.currentKeyframeRule[i] ;i++) { 760 for (i =0; this.currentKeyframeRule[i] ;i++) {
765 var newTween = {}; 761 var newTween = {};
@@ -888,7 +884,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
888 keyframeString += " }"; 884 keyframeString += " }";
889 // set the keyframe string as the new rule 885 // set the keyframe string as the new rule
890 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); 886 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
891 this.application.ninja.documentController.activeDocument.needsSave = true; 887 this.application.ninja.documentController.activeDocument.model.needsSave = true;
892 } 888 }
893 }, 889 },
894 890