aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js6
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2001c3fb..4ff28fd4 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 },
@@ -977,7 +977,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
977 }, 977 },
978 978
979 selectLayer:{ 979 selectLayer:{
980 value:function (layerIndex) { 980 value:function (layerIndex, userSelection) {
981 var i = 0; 981 var i = 0;
982 var arrLayersLength = this.arrLayers.length; 982 var arrLayersLength = this.arrLayers.length;
983 983
@@ -995,7 +995,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
995 this.layerRepetition.selectedIndexes = [layerIndex]; 995 this.layerRepetition.selectedIndexes = [layerIndex];
996 this.trackRepetition.selectedIndexes = [layerIndex]; 996 this.trackRepetition.selectedIndexes = [layerIndex];
997 this.currentLayerSelected = this.arrLayers[layerIndex]; 997 this.currentLayerSelected = this.arrLayers[layerIndex];
998 if(!this._openDoc){ 998 if(userSelection){
999 if(this._captureSelection){ 999 if(this._captureSelection){
1000 if(this.currentLayerSelected.elementsList.length >= 1){ 1000 if(this.currentLayerSelected.elementsList.length >= 1){
1001 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList); 1001 this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList);
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 3a195f47..6ff38bef 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -175,7 +175,7 @@ var Tween = exports.Tween = Montage.create(Component, {
175 175
176 // select the containing layer 176 // select the containing layer
177 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID); 177 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.parentComponent.parentComponent.trackID);
178 this.application.ninja.timeline.selectLayer(selectIndex); 178 this.application.ninja.timeline.selectLayer(selectIndex, true);
179 179
180 // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline 180 // tell timeline to deselect all other tweens and push this one as the currentSelectedTweens in timeline
181 this.application.ninja.timeline.deselectTweens(); 181 this.application.ninja.timeline.deselectTweens();