aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js20
1 files changed, 11 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 4eed6af8..8c3b64eb 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -543,7 +543,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
543 this.drawTimeMarkers(); 543 this.drawTimeMarkers();
544 // Document switching 544 // Document switching
545 // Check to see if we have saved timeline information in the currentDocument. 545 // Check to see if we have saved timeline information in the currentDocument.
546 debugger; 546 //debugger;
547 if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined")) { 547 if ((typeof(this.application.ninja.currentDocument.isTimelineInitialized) === "undefined")) {
548 //console.log('TimelinePanel.initTimelineForDocument: new Document'); 548 //console.log('TimelinePanel.initTimelineForDocument: new Document');
549 // No, we have no information stored. 549 // No, we have no information stored.
@@ -611,7 +611,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
611 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected; 611 this.currentLayerSelected = this.application.ninja.currentDocument.tlCurrentLayerSelected;
612 612
613 613
614 debugger; 614 //debugger;
615 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { 615 if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") {
616 this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; 616 this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer;
617 } 617 }
@@ -774,13 +774,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
774 value:function () { 774 value:function () {
775 var layerIndex, i = 0, arrLayersLength = this.arrLayers.length; 775 var layerIndex, i = 0, arrLayersLength = this.arrLayers.length;
776 this.deselectTweens(); 776 this.deselectTweens();
777 if (this.application.ninja.selectedElements[0]) { 777 if (this.application.ninja.selectedElements.length === 1) {
778 for (i = 0; i < arrLayersLength; i++) { 778 if (this.application.ninja.selectedElements[0]) {
779 if (this.application.ninja.selectedElements[0].uuid === this.arrLayers[i].layerData.elementsList[0].uuid) { 779 for (i = 0; i < arrLayersLength; i++) {
780 layerIndex = this.getLayerIndexByID(this.arrLayers[i].layerData.layerID); 780 if (this.application.ninja.selectedElements[0].uuid === this.arrLayers[i].layerData.elementsList[0].uuid) {
781 this._captureSelection = false; 781 layerIndex = this.getLayerIndexByID(this.arrLayers[i].layerData.layerID);
782 this.selectLayer(layerIndex); 782 this._captureSelection = false;
783 this._captureSelection = true; 783 this.selectLayer(layerIndex);
784 this._captureSelection = true;
785 }
784 } 786 }
785 } 787 }
786 } 788 }