3 files changed, 13 insertions, 24 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f571c1d4..db4ad712 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -482,11 +482,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     triggerOutgoingBinding : {
         value: function() {
-                if (this.layerData.triggerBinding === true) {
-                        this.layerData.triggerBinding = false;
-                } else {
-                        this.layerData.triggerBinding = true;
-                }
+            this.layerData.triggerBinding = !this.layerData.triggerBinding;
         }
     },
         /* END: Models */
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 290dd6c1..a3965eb2 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -487,6 +487,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             returnObj.layerData.isVisible = true;
             returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid;
             returnObj.layerData.isTrackAnimated = false;
+            returnObj.layerData.triggerBinding = false;
             returnObj.parentElementUUID = null;
             returnObj.parentElement = null;
             
@@ -679,13 +680,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]);
                         }
                     }
                 }
@@ -1522,12 +1523,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     // Trigger the layer/track data binding
     triggerLayerBinding : {
         value: function(intIndex) {
-                if (this.arrLayers[intIndex].layerData.triggerBinding === true) {
-                        this.arrLayers[intIndex].layerData.triggerBinding = false;
-                } else {
-                        this.arrLayers[intIndex].layerData.triggerBinding = true;
-                }
-        }
+            this.arrLayers[intIndex].layerData.triggerBinding = !this.arrLayers[intIndex].layerData.triggerBinding;
+        }
     },
     
     handleLayerDragStart : {
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 075290c7..8dc19958 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -453,11 +453,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
     
     triggerOutgoingBinding : {
         value: function() {
-                if (this.trackData.triggerBinding === true) {
-                        this.trackData.triggerBinding = false;
-                } else {
-                        this.trackData.triggerBinding = true;
-                }
+            this.trackData.triggerBinding = !this.trackData.triggerBinding;
         }
     },
 
@@ -527,7 +523,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) {
@@ -688,7 +684,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                 this.nextKeyframe += 1;
             }
 
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
         }
     },
 
@@ -759,7 +755,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 = {};
@@ -888,7 +884,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             keyframeString += " }";
             // set the keyframe string as the new rule
             this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString);
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
         }
     },