diff options
author | Jonathan Duran | 2012-03-06 11:31:26 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-03-06 11:31:26 -0800 |
commit | 2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6 (patch) | |
tree | 5b34643565b3b70b82345f9c491c66729f58f4bb /js/panels/Timeline/TimelinePanel.reel | |
parent | 6f1d1232e54d3d30b24abe0319dcfe5f4dc30f66 (diff) | |
download | ninja-2815adfd7c19b3dff89dc3e1bda9af8d30dca8d6.tar.gz |
Timeline Fix for layer/element selection
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-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 93fd170e..91277a63 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -494,7 +494,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
494 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); | 494 | var ptrParent = nj.queryParentSelector(event.target, ".container-layer"); |
495 | if (ptrParent !== false) { | 495 | if (ptrParent !== false) { |
496 | var myIndex = this.getActiveLayerIndex(); | 496 | var myIndex = this.getActiveLayerIndex(); |
497 | this.selectLayer(myIndex); | 497 | this.selectLayer(myIndex, true); |
498 | } | 498 | } |
499 | } | 499 | } |
500 | }, | 500 | }, |
@@ -978,7 +978,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
978 | }, | 978 | }, |
979 | 979 | ||
980 | selectLayer:{ | 980 | selectLayer:{ |
981 | value:function (layerIndex) { | 981 | value:function (layerIndex, userSelection) { |
982 | var i = 0; | 982 | var i = 0; |
983 | var arrLayersLength = this.arrLayers.length; | 983 | var arrLayersLength = this.arrLayers.length; |
984 | 984 | ||
@@ -996,7 +996,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
996 | this.layerRepetition.selectedIndexes = [layerIndex]; | 996 | this.layerRepetition.selectedIndexes = [layerIndex]; |
997 | this.trackRepetition.selectedIndexes = [layerIndex]; | 997 | this.trackRepetition.selectedIndexes = [layerIndex]; |
998 | this.currentLayerSelected = this.arrLayers[layerIndex]; | 998 | this.currentLayerSelected = this.arrLayers[layerIndex]; |
999 | if(!this._openDoc){ | 999 | if(userSelection){ |
1000 | if(this._captureSelection){ | 1000 | if(this._captureSelection){ |
1001 | if(this.currentLayerSelected.elementsList.length >= 1){ | 1001 | if(this.currentLayerSelected.elementsList.length >= 1){ |
1002 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); | 1002 | this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); |