aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js34
1 files changed, 8 insertions, 26 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index c17a3290..9c782787 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -131,22 +131,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
131 } 131 }
132 }, 132 },
133 133
134 _arrTracks:{
135 serializable:true,
136 value:[]
137 },
138
139 arrTracks:{
140 serializable:true,
141 get:function () {
142 return this._arrTracks;
143 },
144 set:function (newVal) {
145 this._arrTracks = newVal;
146 this._cacheArrays();
147 }
148 },
149
150 _trackRepetition:{ 134 _trackRepetition:{
151 serializable:true, 135 serializable:true,
152 value:null 136 value:null
@@ -335,7 +319,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
335 319
336 } 320 }
337 // After recreating the tracks and layers, store the result in the currentDocument. 321 // After recreating the tracks and layers, store the result in the currentDocument.
338 this.application.ninja.currentDocument.tlArrTracks = this.arrTracks;
339 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers; 322 this.application.ninja.currentDocument.tlArrLayers = this.arrLayers;
340 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber; 323 this.application.ninja.currentDocument.tllayerNumber = this.currentLayerNumber;
341 this.application.ninja.currentDocument.tlLayerHashTable = this.hashInstance; 324 this.application.ninja.currentDocument.tlLayerHashTable = this.hashInstance;
@@ -347,8 +330,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
347 } else { 330 } else {
348 // we do have information stored. Use it. 331 // we do have information stored. Use it.
349 this._boolCacheArrays = false; 332 this._boolCacheArrays = false;
350 this.arrLayers = []; 333 //this.arrLayers = [];
351 this.arrTracks = [];
352 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers; 334 this.arrLayers = this.application.ninja.currentDocument.tlArrLayers;
353 this.arrTracks = this.application.ninja.currentDocument.tlArrTracks; 335 this.arrTracks = this.application.ninja.currentDocument.tlArrTracks;
354 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber; 336 this.currentLayerNumber = this.application.ninja.currentDocument.tllayerNumber;
@@ -362,9 +344,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
362 } 344 }
363 345
364 // Redraw all the things 346 // Redraw all the things
365 this.layerRepetition.needsDraw = true; 347 //this.layerRepetition.needsDraw = true;
366 this.trackRepetition.needsDraw = true; 348 //this.trackRepetition.needsDraw = true;
367 this.needsDraw = true; 349 //this.needsDraw = true;
368 } 350 }
369 }, 351 },
370 352
@@ -386,7 +368,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
386 this.hashInstance = null; 368 this.hashInstance = null;
387 this.hashLayerNumber = null; 369 this.hashLayerNumber = null;
388 this.hashElementMapToLayer = null; 370 this.hashElementMapToLayer = null;
389 this.arrTracks = [];
390 this.arrLayers = []; 371 this.arrLayers = [];
391 372
392 this.currentLayerNumber = 0; 373 this.currentLayerNumber = 0;
@@ -551,7 +532,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
551 var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); 532 var ptrParent = nj.queryParentSelector(event.target, ".container-layer");
552 if (ptrParent !== false) { 533 if (ptrParent !== false) {
553 var myIndex = this.getActiveLayerIndex(); 534 var myIndex = this.getActiveLayerIndex();
554 this.selectLayer(myIndex); 535 this.selectLayer(myIndex, true);
555 } 536 }
556 } 537 }
557 }, 538 },
@@ -678,6 +659,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
678 newLayerName = "Layer " + this.currentLayerNumber; 659 newLayerName = "Layer " + this.currentLayerNumber;
679 thingToPush.layerName = newLayerName; 660 thingToPush.layerName = newLayerName;
680 thingToPush.layerID = this.currentLayerNumber; 661 thingToPush.layerID = this.currentLayerNumber;
662 thingToPush.bypassAnimation = false;
681 thingToPush.isMainCollapsed = true; 663 thingToPush.isMainCollapsed = true;
682 thingToPush.isPositionCollapsed = true; 664 thingToPush.isPositionCollapsed = true;
683 thingToPush.isTransformCollapsed = true; 665 thingToPush.isTransformCollapsed = true;
@@ -986,7 +968,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
986 }, 968 },
987 969
988 selectLayer:{ 970 selectLayer:{
989 value:function (layerIndex) { 971 value:function (layerIndex, userSelection) {
990 var i = 0; 972 var i = 0;
991 var arrLayersLength = this.arrLayers.length; 973 var arrLayersLength = this.arrLayers.length;
992 974
@@ -1004,7 +986,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1004 this.layerRepetition.selectedIndexes = [layerIndex]; 986 this.layerRepetition.selectedIndexes = [layerIndex];
1005 this.trackRepetition.selectedIndexes = [layerIndex]; 987 this.trackRepetition.selectedIndexes = [layerIndex];
1006 this.currentLayerSelected = this.arrLayers[layerIndex]; 988 this.currentLayerSelected = this.arrLayers[layerIndex];
1007 if(!this._openDoc){ 989 if(userSelection){
1008 if(this._captureSelection){ 990 if(this._captureSelection){
1009 if(this.currentLayerSelected.elementsList.length >= 1){ 991 if(this.currentLayerSelected.elementsList.length >= 1){
1010 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); 992 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList);