aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-06-04 10:43:29 -0700
committerAnanya Sen2012-06-04 10:43:29 -0700
commit6fb29883329c9c42a8b406128b92c0e6323a47be (patch)
tree07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/panels/Timeline/Layer.reel
parentcf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff)
parentc1ec69879028220b0c3f11ad6e24035bf527802c (diff)
downloadninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index e8619d02..16fb0303 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -717,7 +717,7 @@ var Layer = exports.Layer = Montage.create(Component, {
717 this.dynamicLayerName.value = this._layerEditable.value; 717 this.dynamicLayerName.value = this._layerEditable.value;
718 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;
719 this.needsDraw = true; 719 this.needsDraw = true;
720 this.application.ninja.documentController.activeDocument.model.needsSave = true; 720 this.application.ninja.currentDocument.model.needsSave = true;
721 } 721 }
722 }, 722 },
723 handleAddStyleClick: { 723 handleAddStyleClick: {
@@ -745,7 +745,7 @@ var Layer = exports.Layer = Montage.create(Component, {
745 this.dynamicLayerName.value = newVal; 745 this.dynamicLayerName.value = newVal;
746 this.layerName = newVal; 746 this.layerName = newVal;
747 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal; 747 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal;
748 this.application.ninja.documentController.activeDocument.model.needsSave = true; 748 this.application.ninja.currentDocument.model.needsSave = true;
749 this.needsDraw = true; 749 this.needsDraw = true;
750 } 750 }
751 }, 751 },