aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline
diff options
context:
space:
mode:
authorJon Reid2012-03-06 14:15:18 -0800
committerJon Reid2012-03-06 14:15:18 -0800
commit78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3 (patch)
treec395b703f21431dcb4432c725f4c860431add61b /js/panels/Timeline
parentfa8b81d4f436c0b8564c8dcdd22d8dd6d5bccfaa (diff)
parent60bba95eaffa8b5c741c6c85fb84b327cd75d6c3 (diff)
downloadninja-78d42c7cbf9205ed2e4faee1d8ddf02a4725edd3.tar.gz
Merge branch 'Timeline-uber' into timeline-serialized
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 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);
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();