diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 7be34d74..2c98233c 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -473,7 +473,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
473 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); | 473 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); |
474 | if (ptrParent !== false) { | 474 | if (ptrParent !== false) { |
475 | var myIndex = this.getActiveLayerIndex(); | 475 | var myIndex = this.getActiveLayerIndex(); |
476 | this.selectLayer(myIndex); | 476 | this.selectLayer(myIndex, true); |
477 | } | 477 | } |
478 | } | 478 | } |
479 | }, | 479 | }, |
@@ -957,7 +957,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
957 | }, | 957 | }, |
958 | 958 | ||
959 | selectLayer:{ | 959 | selectLayer:{ |
960 | value:function (layerIndex) { | 960 | value:function (layerIndex, userSelection) { |
961 | var i = 0; | 961 | var i = 0; |
962 | var arrLayersLength = this.arrLayers.length; | 962 | var arrLayersLength = this.arrLayers.length; |
963 | 963 | ||
@@ -975,7 +975,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
975 | this.layerRepetition.selectedIndexes = [layerIndex]; | 975 | this.layerRepetition.selectedIndexes = [layerIndex]; |
976 | this.trackRepetition.selectedIndexes = [layerIndex]; | 976 | this.trackRepetition.selectedIndexes = [layerIndex]; |
977 | this.currentLayerSelected = this.arrLayers[layerIndex]; | 977 | this.currentLayerSelected = this.arrLayers[layerIndex]; |
978 | if(!this._openDoc){ | 978 | if(userSelection){ |
979 | if(this._captureSelection){ | 979 | if(this._captureSelection){ |
980 | if(this.currentLayerSelected.elementsList.length >= 1){ | 980 | if(this.currentLayerSelected.elementsList.length >= 1){ |
981 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); | 981 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); |