aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 4177c681..df1a25a8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -786,6 +786,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
786 786
787 this.currentLayerNumber = this.currentLayerNumber + 1; 787 this.currentLayerNumber = this.currentLayerNumber + 1;
788 newLayerName = "Layer " + this.currentLayerNumber; 788 newLayerName = "Layer " + this.currentLayerNumber;
789
790 if(ele.dataset.storedLayerName){
791 newLayerName = ele.dataset.storedLayerName;
792 }
789 thingToPush.layerData.layerName = newLayerName; 793 thingToPush.layerData.layerName = newLayerName;
790 thingToPush.layerData.layerID = this.currentLayerNumber; 794 thingToPush.layerData.layerID = this.currentLayerNumber;
791 thingToPush.parentElementUUID = this.hashKey; 795 thingToPush.parentElementUUID = this.hashKey;
@@ -816,6 +820,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
816 // Delete the selected layer. 820 // Delete the selected layer.
817 var myIndex = this.layerRepetition.selectedIndexes[0]; 821 var myIndex = this.layerRepetition.selectedIndexes[0];
818 this.arrLayers.splice(myIndex, 1); 822 this.arrLayers.splice(myIndex, 1);
823 var selectIndex = this.arrLayers.length;
824 this.selectLayer(selectIndex-1);
819 } 825 }
820 } 826 }
821 }, 827 },
@@ -824,6 +830,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
824 value:function() { 830 value:function() {
825 this.createNewLayer(); 831 this.createNewLayer();
826 this.currentLayerSelected.layerData.elementsList.push(this.application.ninja.selectedElements[0]._element); 832 this.currentLayerSelected.layerData.elementsList.push(this.application.ninja.selectedElements[0]._element);
833 this.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.currentLayerSelected.layerData.layerName;
827 } 834 }
828 }, 835 },
829 836