diff options
author | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-24 13:54:00 -0700 |
commit | fd4af6d81725dfa0630ac5e52ba95405336f4074 (patch) | |
tree | 868197f79862e98b9c7f5a1f296d64832c68d48f /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |
parent | de25d2b7d05476d4f0d385b5e910db189f682d21 (diff) | |
parent | 70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff) | |
download | ninja-fd4af6d81725dfa0630ac5e52ba95405336f4074.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 2c02e544..c55e5a24 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -598,11 +598,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
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 && this.application.ninja.currentDocument.currentView !== "code") { | 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 | } |