aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Reid2012-04-17 15:30:44 -0700
committerJon Reid2012-04-17 15:30:44 -0700
commitd6f3f53a86f4efc45eabb519c94456731f6425e1 (patch)
tree1871ac3e2c26ef8b0d38b170006cb31d75e93586
parentdf1de25aaf7c7b552946dc0f616c488d6a980ea0 (diff)
downloadninja-d6f3f53a86f4efc45eabb519c94456731f6425e1.tar.gz
Timeline: Bug fix: changing layer name didn't save in some circumstances.
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js7
2 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 3bc87f68..36c77018 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -758,6 +758,8 @@ var Layer = exports.Layer = Montage.create(Component, {
758 } 758 }
759 this.dynamicLayerName.value = newVal; 759 this.dynamicLayerName.value = newVal;
760 this.layerName = newVal; 760 this.layerName = newVal;
761 this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal;
762 this.application.ninja.documentController.activeDocument.needsSave = true;
761 this.needsDraw = true; 763 this.needsDraw = true;
762 } 764 }
763 }, 765 },
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 48bce268..0062affe 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -312,7 +312,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
312 this.initTimeline(); 312 this.initTimeline();
313 // Bind the event handler for the document change events 313 // Bind the event handler for the document change events
314 this.eventManager.addEventListener("onOpenDocument", this.handleDocumentChange.bind(this), false); 314 this.eventManager.addEventListener("onOpenDocument", this.handleDocumentChange.bind(this), false);
315 //this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false); 315 this.eventManager.addEventListener("closeDocument", this.handleDocumentChange.bind(this), false);
316 this.eventManager.addEventListener("switchDocument", this.handleDocumentChange.bind(this), false); 316 this.eventManager.addEventListener("switchDocument", this.handleDocumentChange.bind(this), false);
317 317
318 // Bind drag and drop event handlers 318 // Bind drag and drop event handlers
@@ -682,7 +682,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
682 handleDocumentChange:{ 682 handleDocumentChange:{
683 value:function (event) { 683 value:function (event) {
684 // Clear the timeline but not the cache 684 // Clear the timeline but not the cache
685 //console.log('TimelinePanel.handleDocumentChange') 685 //console.log('TimelinePanel.handleDocumentChange');
686 if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) {
687 return;
688 }
686 this._boolCacheArrays = false; 689 this._boolCacheArrays = false;
687 this.clearTimelinePanel(); 690 this.clearTimelinePanel();
688 this._boolCacheArrays = true; 691 this._boolCacheArrays = true;