aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js6
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
2 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index c382c9a7..d61075ac 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -597,11 +597,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
597 // But what if we're opening an existing document? 597 // But what if we're opening an existing document?
598 if (!this.application.ninja.documentController.creatingNewFile) { 598 if (!this.application.ninja.documentController.creatingNewFile) {
599 // Opening an existing document. If it has DOM elements we need to restore their timeline info 599 // Opening an existing document. If it has DOM elements we need to restore their timeline info
600 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 600 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
601 // Yes, it has DOM elements. Loop through them and create a new object for each. 601 // Yes, it has DOM elements. Loop through them and create a new object for each.
602 for (myIndex = 0; this.application.ninja.currentDocument.documentRoot.children[myIndex]; myIndex++) { 602 for (myIndex = 0; this.application.ninja.currentDocument.model.documentRoot.children[myIndex]; myIndex++) {
603 this._openDoc = true; 603 this._openDoc = true;
604 this.restoreLayer(this.application.ninja.currentDocument.documentRoot.children[myIndex]); 604 this.restoreLayer(this.application.ninja.currentDocument.model.documentRoot.children[myIndex]);
605 } 605 }
606 } 606 }
607 } 607 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 2c15a99c..adc50c58 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -438,7 +438,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
438 didDraw:{ 438 didDraw:{
439 value:function () { 439 value:function () {
440 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { 440 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) {
441 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 441 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
442 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 442 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
443 if (selectedIndex !== false) { 443 if (selectedIndex !== false) {
444 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { 444 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
@@ -592,7 +592,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
592 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 592 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
593 this.nextKeyframe = 0; 593 this.nextKeyframe = 0;
594 594
595 this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document); 595 this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document);
596 596
597 for (i =0; this.currentKeyframeRule[i] ;i++) { 597 for (i =0; this.currentKeyframeRule[i] ;i++) {
598 var newTween = {}; 598 var newTween = {};