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.js8
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
2 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 80133edf..c55e5a24 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -596,13 +596,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
596 596
597 // That's all we need to do for a brand new file. 597 // That's all we need to do for a brand new file.
598 // But what if we're opening an existing document? 598 // But what if we're opening an existing document?
599 if (!this.application.ninja.documentController.creatingNewFile) { 599 if (!this.application.ninja.documentController.creatingNewFile && this.application.ninja.currentDocument.currentView !== "code") {
600 // Opening an existing document. If it has DOM elements we need to restore their timeline info 600 // Opening an existing document. If it has DOM elements we need to restore their timeline info
601 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 601 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
602 // Yes, it has DOM elements. Loop through them and create a new object for each. 602 // Yes, it has DOM elements. Loop through them and create a new object for each.
603 for (myIndex = 0; this.application.ninja.currentDocument.documentRoot.children[myIndex]; myIndex++) { 603 for (myIndex = 0; this.application.ninja.currentDocument.model.documentRoot.children[myIndex]; myIndex++) {
604 this._openDoc = true; 604 this._openDoc = true;
605 this.restoreLayer(this.application.ninja.currentDocument.documentRoot.children[myIndex]); 605 this.restoreLayer(this.application.ninja.currentDocument.model.documentRoot.children[myIndex]);
606 } 606 }
607 } 607 }
608 } 608 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 3d83dc36..ff684446 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -434,7 +434,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
434 didDraw:{ 434 didDraw:{
435 value:function () { 435 value:function () {
436 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { 436 if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) {
437 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 437 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
438 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 438 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
439 if (selectedIndex !== false) { 439 if (selectedIndex !== false) {
440 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { 440 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
@@ -588,7 +588,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
588 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); 588 trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
589 this.nextKeyframe = 0; 589 this.nextKeyframe = 0;
590 590
591 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);
592 592
593 for (i =0; this.currentKeyframeRule[i] ;i++) { 593 for (i =0; this.currentKeyframeRule[i] ;i++) {
594 var newTween = {}; 594 var newTween = {};