aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:17:41 -0700
committerArmen Kesablyan2012-06-11 11:17:41 -0700
commit278769df00ced8620fd73371e38fe2e43f07ca3b (patch)
treedeb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/panels/Timeline/TimelineTrack.reel
parent555fd6efa605b937800b3979a4c68fa7eb8666ae (diff)
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
downloadninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index ff684446..126e6a61 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -564,7 +564,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
564 this.nextKeyframe += 1; 564 this.nextKeyframe += 1;
565 } 565 }
566 566
567 this.application.ninja.documentController.activeDocument.model.needsSave = true; 567 this.application.ninja.currentDocument.model.needsSave = true;
568 } 568 }
569 }, 569 },
570 570
@@ -683,7 +683,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
683 keyframeString += " }"; 683 keyframeString += " }";
684 // set the keyframe string as the new rule 684 // set the keyframe string as the new rule
685 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); 685 this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
686 this.application.ninja.documentController.activeDocument.model.needsSave = true; 686 this.application.ninja.currentDocument.model.needsSave = true;
687 } 687 }
688 }, 688 },
689 689