aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js13
1 files changed, 4 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index a5cde00f..5f484cdb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -318,6 +318,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
318 value:function (event) { 318 value:function (event) {
319 this._isLayer = true; 319 this._isLayer = true;
320 this.needsDraw = true; 320 this.needsDraw = true;
321 this.application.ninja.selectionController.executeSelectElement();
321 } 322 }
322 }, 323 },
323 324
@@ -499,7 +500,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
499 this.arrTracks.splice(myIndex, 0, newTrack); 500 this.arrTracks.splice(myIndex, 0, newTrack);
500 this.arrLayers.splice(myIndex, 0, thingToPush); 501 this.arrLayers.splice(myIndex, 0, thingToPush);
501 this._LayerUndoPosition = myIndex; 502 this._LayerUndoPosition = myIndex;
502// this.selectLayer(myIndex); 503 this.selectLayer(myIndex);
503 this.hashLayerNumber.setItem(this._hashKey, thingToPush); 504 this.hashLayerNumber.setItem(this._hashKey, thingToPush);
504 this.hashInstance.setItem(this._hashKey, thingToPush, myIndex); 505 this.hashInstance.setItem(this._hashKey, thingToPush, myIndex);
505 this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex); 506 this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
@@ -512,16 +513,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
512 this.hashLayerNumber.setItem(this._hashKey, thingToPush); 513 this.hashLayerNumber.setItem(this._hashKey, thingToPush);
513 this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition); 514 this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition);
514 this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition); 515 this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition);
515// this.selectLayer(0); 516 this.selectLayer(0);
516 517
517 } 518 }
518 this._LayerUndoObject = thingToPush; 519 this._LayerUndoObject = thingToPush;
519 this._LayerUndoIndex = thingToPush.layerID; 520 this._LayerUndoIndex = thingToPush.layerID;
520 this._LayerUndoStatus = true; 521 this._LayerUndoStatus = true;
521 this._TrackUndoObject = newTrack; 522 this._TrackUndoObject = newTrack;
522// if(_firstLayerDraw){ 523
523// this.application.ninja.selectionController.executeSelectElement();
524// }
525 524
526 } 525 }
527 } 526 }
@@ -846,10 +845,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
846 this.trackRepetition.selectedIndexes = [layerIndex]; 845 this.trackRepetition.selectedIndexes = [layerIndex];
847 this.currentLayerSelected = this.arrLayers[layerIndex]; 846 this.currentLayerSelected = this.arrLayers[layerIndex];
848 this.currentTrackSelected = this.arrTracks[layerIndex]; 847 this.currentTrackSelected = this.arrTracks[layerIndex];
849 /*if(this._captureSelection){
850 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList)
851 }*/
852 this._captureSelection = true;
853 } else { 848 } else {
854 this.layerRepetition.selectedIndexes = null; 849 this.layerRepetition.selectedIndexes = null;
855 this.trackRepetition.selectedIndexes = null; 850 this.trackRepetition.selectedIndexes = null;