aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/panels/Timeline/Layer.reel
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index b23da749..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 */
@@ -721,7 +717,7 @@ var Layer = exports.Layer = Montage.create(Component, {
721 this.dynamicLayerName.value = this._layerEditable.value; 717 this.dynamicLayerName.value = this._layerEditable.value;
722 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.dynamicLayerName.value; 718 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.dynamicLayerName.value;
723 this.needsDraw = true; 719 this.needsDraw = true;
724 this.application.ninja.documentController.activeDocument.needsSave = true; 720 this.application.ninja.documentController.activeDocument.model.needsSave = true;
725 } 721 }
726 }, 722 },
727 handleAddStyleClick: { 723 handleAddStyleClick: {
@@ -749,7 +745,7 @@ var Layer = exports.Layer = Montage.create(Component, {
749 this.dynamicLayerName.value = newVal; 745 this.dynamicLayerName.value = newVal;
750 this.layerName = newVal; 746 this.layerName = newVal;
751 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal; 747 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal;
752 this.application.ninja.documentController.activeDocument.needsSave = true; 748 this.application.ninja.documentController.activeDocument.model.needsSave = true;
753 this.needsDraw = true; 749 this.needsDraw = true;
754 } 750 }
755 }, 751 },