aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-04-26 13:32:09 -0700
committerJon Reid2012-04-26 13:32:09 -0700
commit3cd248cdeca58effab83373edcb64aa2dac4c9b4 (patch)
treea91f9435efa1f6ae579b42300ce6c64a7d237376 /js
parentddbc1ac7eb35fee9254f4842fe29ab35de3d214c (diff)
downloadninja-3cd248cdeca58effab83373edcb64aa2dac4c9b4.tar.gz
Timeline: comment out a conditional debugger; re-enable layer name storage.
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 51d854f9..7d5b44a8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -812,9 +812,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
812 if (this.application.ninja.selectedElements[0]) { 812 if (this.application.ninja.selectedElements[0]) {
813 checkIndex = this.application.ninja.selectedElements[0].uuid; 813 checkIndex = this.application.ninja.selectedElements[0].uuid;
814 for (i = 0; i < arrLayersLength; i++) { 814 for (i = 0; i < arrLayersLength; i++) {
815 if (typeof(this.arrLayers[i].layerData.elementsList[0]) === "undefined") {
816 debugger;
817 }
818 var currIndex = this.arrLayers[i].layerData.elementsList[0].uuid, 815 var currIndex = this.arrLayers[i].layerData.elementsList[0].uuid,
819 layerID = this.arrLayers[i].layerData.layerID, 816 layerID = this.arrLayers[i].layerData.layerID,
820 layerIndex = 0; 817 layerIndex = 0;
@@ -1111,7 +1108,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1111 this.currentLayerSelected.layerData.elementsList = []; 1108 this.currentLayerSelected.layerData.elementsList = [];
1112 } 1109 }
1113 this.currentLayerSelected.layerData.elementsList.push(this.application.ninja.selectedElements[0]); 1110 this.currentLayerSelected.layerData.elementsList.push(this.application.ninja.selectedElements[0]);
1114 //this.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.currentLayerSelected.layerData.layerName; 1111 this.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.currentLayerSelected.layerData.layerName;
1115 } 1112 }
1116 }, 1113 },
1117 1114