aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 17:16:21 -0700
committerPushkar Joshi2012-05-31 17:16:21 -0700
commit8915a7109d918a2e69b0999ebaa2deb84811fef8 (patch)
tree19a8af74c58c9ea261f0842f36efdab959be3256 /js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
parenteea0a556e44c2b60d3aaf6e46d2432d3e6303812 (diff)
parent06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff)
downloadninja-8915a7109d918a2e69b0999ebaa2deb84811fef8.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js21
1 files changed, 9 insertions, 12 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index d1cab096..c55e5a24 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -110,7 +110,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
110 this._selectedLayerID = newVal; 110 this._selectedLayerID = newVal;
111 this._captureSelection = true; 111 this._captureSelection = true;
112 if (this.currentLayerSelected !== false) { 112 if (this.currentLayerSelected !== false) {
113 this.selectLayer(selectIndex, true); 113 this.selectLayer(selectIndex, false);
114 } 114 }
115 if (this.currentLayersSelected !== false) { 115 if (this.currentLayersSelected !== false) {
116 this.selectLayers(this.currentLayersSelected); 116 this.selectLayers(this.currentLayersSelected);
@@ -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,13 +596,13 @@ 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.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.
602 for (myIndex = 0; this.application.ninja.currentDocument.documentRoot.children[myIndex]; myIndex++) { 603 for (myIndex = 0; this.application.ninja.currentDocument.model.documentRoot.children[myIndex]; myIndex++) {
603 this._openDoc = true; 604 this._openDoc = true;
604 this.restoreLayer(this.application.ninja.currentDocument.documentRoot.children[myIndex]); 605 this.restoreLayer(this.application.ninja.currentDocument.model.documentRoot.children[myIndex]);
605 } 606 }
606 } 607 }
607 } 608 }
@@ -994,7 +995,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
994 this.arrLayers.splice(myIndex, 0, thingToPush); 995 this.arrLayers.splice(myIndex, 0, thingToPush);
995 996
996 } 997 }
997 this.selectLayer(myIndex); 998 this.selectLayer(myIndex, false);
998 } 999 }
999 }, 1000 },
1000 1001
@@ -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 : {