aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js11
1 files changed, 4 insertions, 7 deletions
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, {
437 returnObj.layerData.isVisible = true; 437 returnObj.layerData.isVisible = true;
438 returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid; 438 returnObj.layerData.docUUID = this.application.ninja.currentDocument._uuid;
439 returnObj.layerData.isTrackAnimated = false; 439 returnObj.layerData.isTrackAnimated = false;
440 returnObj.layerData.triggerBinding = false;
440 returnObj.parentElementUUID = null; 441 returnObj.parentElementUUID = null;
441 returnObj.parentElement = null; 442 returnObj.parentElement = null;
442 443
@@ -595,7 +596,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
595 596
596 // 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.
597 // But what if we're opening an existing document? 598 // But what if we're opening an existing document?
598 if (!this.application.ninja.documentController.creatingNewFile) { 599 if (!this.application.ninja.documentController.creatingNewFile && this.application.ninja.currentDocument.currentView !== "code") {
599 // 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
600 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) { 601 if (this.application.ninja.currentDocument.model.documentRoot.children[0]) {
601 // 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.
@@ -1402,12 +1403,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1402 // Trigger the layer/track data binding 1403 // Trigger the layer/track data binding
1403 triggerLayerBinding : { 1404 triggerLayerBinding : {
1404 value: function(intIndex) { 1405 value: function(intIndex) {
1405 if (this.arrLayers[intIndex].layerData.triggerBinding === true) { 1406 this.arrLayers[intIndex].layerData.triggerBinding = !this.arrLayers[intIndex].layerData.triggerBinding;
1406 this.arrLayers[intIndex].layerData.triggerBinding = false; 1407 }
1407 } else {
1408 this.arrLayers[intIndex].layerData.triggerBinding = true;
1409 }
1410 }
1411 }, 1408 },
1412 1409
1413 handleLayerDragStart : { 1410 handleLayerDragStart : {