Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

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, {
 
                                 // That's all we need to do for a brand new file. 
                 // But what if we're opening an existing document?
-                if (!this.application.ninja.documentController.creatingNewFile) {
+                if (!this.application.ninja.documentController.creatingNewFile && this.application.ninja.currentDocument.currentView !== "code") {
                     // Opening an existing document. If it has DOM elements we need to restore their timeline info
-                    if (this.application.ninja.currentDocument.documentRoot.children[0]) {
+                    if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
                         // Yes, it has DOM elements. Loop through them and create a new object for each.
-                        for (myIndex = 0; this.application.ninja.currentDocument.documentRoot.children[myIndex]; myIndex++) {
+                        for (myIndex = 0; this.application.ninja.currentDocument.model.documentRoot.children[myIndex]; myIndex++) {
                             this._openDoc = true;
-                            this.restoreLayer(this.application.ninja.currentDocument.documentRoot.children[myIndex]);
+                            this.restoreLayer(this.application.ninja.currentDocument.model.documentRoot.children[myIndex]);
                         }
                     }
                 }
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, {
     didDraw:{
         value:function () {
             if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) {
-                if (this.application.ninja.currentDocument.documentRoot.children[0]) {
+                if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
                     var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
                     if (selectedIndex !== false) {
                             if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
@@ -588,7 +588,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                     trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
                     this.nextKeyframe = 0;
 
-                    this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
+                    this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document);
 
                     for (i =0; this.currentKeyframeRule[i] ;i++) {
                         var newTween = {};