Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document

Conflicts:
	js/document/document-html.js
	js/helper-classes/3D/view-utils.js
	js/stage/stage.reel/stage.js

3 files changed, 6 insertions, 17 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 6358a0e0..e8619d02 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -498,11 +498,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 d61075ac..c55e5a24 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -437,6 +437,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;
             
@@ -595,7 +596,7 @@ 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.model.documentRoot.children[0]) {
                         // Yes, it has DOM elements. Loop through them and create a new object for each.
@@ -1402,12 +1403,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 adc50c58..ff684446 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -405,11 +405,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;
         }
     },