diff options
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 14 |
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 efeeba00..ff684446 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -405,11 +405,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
405 | 405 | ||
406 | triggerOutgoingBinding : { | 406 | triggerOutgoingBinding : { |
407 | value: function() { | 407 | value: function() { |
408 | if (this.trackData.triggerBinding === true) { | 408 | this.trackData.triggerBinding = !this.trackData.triggerBinding; |
409 | this.trackData.triggerBinding = false; | ||
410 | } else { | ||
411 | this.trackData.triggerBinding = true; | ||
412 | } | ||
413 | } | 409 | } |
414 | }, | 410 | }, |
415 | 411 | ||
@@ -438,7 +434,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
438 | didDraw:{ | 434 | didDraw:{ |
439 | value:function () { | 435 | value:function () { |
440 | if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { | 436 | if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { |
441 | if (this.application.ninja.currentDocument.documentRoot.children[0]) { | 437 | if (this.application.ninja.currentDocument.model.documentRoot.children[0]) { |
442 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 438 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
443 | if (selectedIndex !== false) { | 439 | if (selectedIndex !== false) { |
444 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { | 440 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { |
@@ -568,7 +564,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
568 | this.nextKeyframe += 1; | 564 | this.nextKeyframe += 1; |
569 | } | 565 | } |
570 | 566 | ||
571 | this.application.ninja.documentController.activeDocument.needsSave = true; | 567 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
572 | } | 568 | } |
573 | }, | 569 | }, |
574 | 570 | ||
@@ -592,7 +588,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
592 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 588 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |
593 | this.nextKeyframe = 0; | 589 | this.nextKeyframe = 0; |
594 | 590 | ||
595 | this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document); | 591 | this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document); |
596 | 592 | ||
597 | for (i =0; this.currentKeyframeRule[i] ;i++) { | 593 | for (i =0; this.currentKeyframeRule[i] ;i++) { |
598 | var newTween = {}; | 594 | var newTween = {}; |
@@ -687,7 +683,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
687 | keyframeString += " }"; | 683 | keyframeString += " }"; |
688 | // set the keyframe string as the new rule | 684 | // set the keyframe string as the new rule |
689 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); | 685 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); |
690 | this.application.ninja.documentController.activeDocument.needsSave = true; | 686 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
691 | } | 687 | } |
692 | }, | 688 | }, |
693 | 689 | ||