diff options
| author | Nivesh Rajbhandari | 2012-05-23 16:09:45 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-23 16:09:45 -0700 |
| commit | d874b959bc297fed31d3ef3c2a7c8c77df88f761 (patch) | |
| tree | d36a0b464aed1f3ff91c81df3aaf52df72451472 /js/panels/Timeline | |
| parent | f97590388467b5a3316f6f155162fc293915fddc (diff) | |
| parent | 0ca1910df1c78116139664bf39a95cf0ec7c8dc8 (diff) | |
| download | ninja-d874b959bc297fed31d3ef3c2a7c8c77df88f761.tar.gz | |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 80133edf..2c02e544 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -596,7 +596,7 @@ 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.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. |