aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-24 11:38:51 -0700
committerJose Antonio Marquez2012-05-24 11:38:51 -0700
commite64328dc08418730ca580d33381cb2001c7a96fd (patch)
tree74e3996696adfea94158c29575e9393e56169930 /js/panels/Timeline
parentd57cd68741f340a45be780675ed79b5caf2094e9 (diff)
parenta8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff)
downloadninja-e64328dc08418730ca580d33381cb2001c7a96fd.tar.gz
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
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js11
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js6
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, {
498 498
499 triggerOutgoingBinding : { 499 triggerOutgoingBinding : {
500 value: function() { 500 value: function() {
501 if (this.layerData.triggerBinding === true) { 501 this.layerData.triggerBinding = !this.layerData.triggerBinding;
502 this.layerData.triggerBinding = false;
503 } else {
504 this.layerData.triggerBinding = true;
505 }
506 } 502 }
507 }, 503 },
508 /* END: Models */ 504 /* 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, {
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 : {
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, {
405 405
406 triggerOutgoingBinding : { 406 triggerOutgoingBinding : {
407 value: function() { 407 value: function() {
408 if (this.trackData.triggerBinding === true) { 408 this.trackData.triggerBinding = !this.trackData.triggerBinding;
409 this.trackData.triggerBinding = false;
410 } else {
411 this.trackData.triggerBinding = true;
412 }
413 } 409 }
414 }, 410 },
415 411