aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 33b99760..eeb74625 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -112,7 +112,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
112 var selectIndex = this.getLayerIndexByID(newVal); 112 var selectIndex = this.getLayerIndexByID(newVal);
113 this._selectedLayerID = newVal; 113 this._selectedLayerID = newVal;
114 this._captureSelection = true; 114 this._captureSelection = true;
115 this.selectLayer(selectIndex); 115 //console.log(selectIndex);
116 //debugger;
117 this.selectLayer(selectIndex, true);
116 } 118 }
117 } 119 }
118 }, 120 },
@@ -410,6 +412,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
410 returnObj.layerData.isTrackAnimated = false; 412 returnObj.layerData.isTrackAnimated = false;
411 returnObj.parentElementUUID = null; 413 returnObj.parentElementUUID = null;
412 returnObj.parentElement = null; 414 returnObj.parentElement = null;
415 returnObj.docUUID = this.application.ninja.currentDocument._uuid;
413 416
414 return returnObj; 417 return returnObj;
415 } 418 }
@@ -536,14 +539,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
536 // Initialize BreadCrumb 539 // Initialize BreadCrumb
537 this.application.ninja.breadCrumbClick = false; 540 this.application.ninja.breadCrumbClick = false;
538 this.enablePanel(false); 541 this.enablePanel(false);
539 542
540 /*
541 Object.defineBinding(this, "breadCrumbContainer", {
542 boundObject:this.application.ninja,
543 boundObjectPropertyPath:"currentSelectedContainer",
544 oneway:true
545 });
546 */
547 } 543 }
548 }, 544 },
549 545
@@ -684,6 +680,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
684 // Clear the timeline but not the cache 680 // Clear the timeline but not the cache
685 //console.log('TimelinePanel.handleDocumentChange'); 681 //console.log('TimelinePanel.handleDocumentChange');
686 if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) { 682 if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) {
683 // Ignore extra closeDocument event that fires while there are still documents open.
687 return; 684 return;
688 } 685 }
689 this._boolCacheArrays = false; 686 this._boolCacheArrays = false;