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.js19
1 files changed, 10 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 797a7cbf..92bb3405 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -224,13 +224,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
224 224
225 this._hashKey = "123"; 225 this._hashKey = "123";
226 _firstLayerDraw = false; 226 _firstLayerDraw = false;
227 if(this.application.ninja.currentDocument.documentRoot.children[0]){ 227 if(!this.application.ninja.documentController.creatingNewFile){
228 myIndex=0; 228 if(this.application.ninja.currentDocument.documentRoot.children[0]){
229 while(this.application.ninja.currentDocument.documentRoot.children[myIndex]) 229 myIndex=0;
230 { 230 while(this.application.ninja.currentDocument.documentRoot.children[myIndex])
231 this._openDoc=true; 231 {
232 NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]}) 232 this._openDoc=true;
233 myIndex++; 233 NJevent('newLayer',{key:this._hashKey,ele:this.application.ninja.currentDocument.documentRoot.children[myIndex]})
234 myIndex++;
235 }
234 } 236 }
235 }else{ 237 }else{
236 NJevent('newLayer', this._hashKey); 238 NJevent('newLayer', this._hashKey);
@@ -476,6 +478,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
476 thingToPush.elementsList = []; 478 thingToPush.elementsList = [];
477 thingToPush.deleted = false; 479 thingToPush.deleted = false;
478 thingToPush.isSelected = false; 480 thingToPush.isSelected = false;
481 thingToPush.created=false;
479 if (_firstLayerDraw) { 482 if (_firstLayerDraw) {
480 483
481 this.application.ninja.currentSelectedContainer.uuid=this._hashKey; 484 this.application.ninja.currentSelectedContainer.uuid=this._hashKey;
@@ -735,7 +738,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
735 } 738 }
736 } 739 }
737 hashLayerObject[key][index] = value; 740 hashLayerObject[key][index] = value;
738 console.log(hashLayerObject)
739 this.counter = 0; 741 this.counter = 0;
740 } 742 }
741 }, 743 },
@@ -830,7 +832,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
830 } 832 }
831 this.mappingArray[key]["ele"] = value; 833 this.mappingArray[key]["ele"] = value;
832 this.mappingArray[key].layerID = layer.layerID; 834 this.mappingArray[key].layerID = layer.layerID;
833 console.log(this.mappingArray)
834 835
835 } 836 }
836 }, 837 },