diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 13 |
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 62ae625f..3171cf3c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -312,6 +312,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
312 | value:function (event) { | 312 | value:function (event) { |
313 | this._isLayer = true; | 313 | this._isLayer = true; |
314 | this.needsDraw = true; | 314 | this.needsDraw = true; |
315 | this.application.ninja.selectionController.executeSelectElement(); | ||
315 | } | 316 | } |
316 | }, | 317 | }, |
317 | 318 | ||
@@ -493,7 +494,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
493 | this.arrTracks.splice(myIndex, 0, newTrack); | 494 | this.arrTracks.splice(myIndex, 0, newTrack); |
494 | this.arrLayers.splice(myIndex, 0, thingToPush); | 495 | this.arrLayers.splice(myIndex, 0, thingToPush); |
495 | this._LayerUndoPosition = myIndex; | 496 | this._LayerUndoPosition = myIndex; |
496 | // this.selectLayer(myIndex); | 497 | this.selectLayer(myIndex); |
497 | this.hashLayerNumber.setItem(this._hashKey, thingToPush); | 498 | this.hashLayerNumber.setItem(this._hashKey, thingToPush); |
498 | this.hashInstance.setItem(this._hashKey, thingToPush, myIndex); | 499 | this.hashInstance.setItem(this._hashKey, thingToPush, myIndex); |
499 | this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex); | 500 | this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex); |
@@ -506,16 +507,14 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
506 | this.hashLayerNumber.setItem(this._hashKey, thingToPush); | 507 | this.hashLayerNumber.setItem(this._hashKey, thingToPush); |
507 | this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition); | 508 | this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition); |
508 | this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition); | 509 | this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition); |
509 | // this.selectLayer(0); | 510 | this.selectLayer(0); |
510 | 511 | ||
511 | } | 512 | } |
512 | this._LayerUndoObject = thingToPush; | 513 | this._LayerUndoObject = thingToPush; |
513 | this._LayerUndoIndex = thingToPush.layerID; | 514 | this._LayerUndoIndex = thingToPush.layerID; |
514 | this._LayerUndoStatus = true; | 515 | this._LayerUndoStatus = true; |
515 | this._TrackUndoObject = newTrack; | 516 | this._TrackUndoObject = newTrack; |
516 | // if(_firstLayerDraw){ | 517 | |
517 | // this.application.ninja.selectionController.executeSelectElement(); | ||
518 | // } | ||
519 | 518 | ||
520 | } | 519 | } |
521 | } | 520 | } |
@@ -840,10 +839,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
840 | this.trackRepetition.selectedIndexes = [layerIndex]; | 839 | this.trackRepetition.selectedIndexes = [layerIndex]; |
841 | this.currentLayerSelected = this.arrLayers[layerIndex]; | 840 | this.currentLayerSelected = this.arrLayers[layerIndex]; |
842 | this.currentTrackSelected = this.arrTracks[layerIndex]; | 841 | this.currentTrackSelected = this.arrTracks[layerIndex]; |
843 | /*if(this._captureSelection){ | ||
844 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList) | ||
845 | }*/ | ||
846 | this._captureSelection = true; | ||
847 | } else { | 842 | } else { |
848 | this.layerRepetition.selectedIndexes = null; | 843 | this.layerRepetition.selectedIndexes = null; |
849 | this.trackRepetition.selectedIndexes = null; | 844 | this.trackRepetition.selectedIndexes = null; |