diff options
author | Jonathan Duran | 2012-02-23 14:06:12 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-23 14:06:12 -0800 |
commit | 3a1821d6c14f9f06c81f7e74b3da27bf998c4b6f (patch) | |
tree | 0b98699fb4e6a9aab24025e6ce57ce0b38af16ac /js/panels | |
parent | a8c153cc4f6a4f4f3367b0b2a763fa86b442c201 (diff) | |
download | ninja-3a1821d6c14f9f06c81f7e74b3da27bf998c4b6f.tar.gz |
Move element selection to click handler
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 62ae625f..89d14c17 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 | ||
@@ -513,9 +514,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
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,9 +839,9 @@ 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){ | 842 | if(this._captureSelection){ |
844 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList) | 843 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList) |
845 | }*/ | 844 | } |
846 | this._captureSelection = true; | 845 | this._captureSelection = true; |
847 | } else { | 846 | } else { |
848 | this.layerRepetition.selectedIndexes = null; | 847 | this.layerRepetition.selectedIndexes = null; |