diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 7fb57396..0b688139 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -113,7 +113,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
113 | var selectIndex = this.getLayerIndexByID(newVal); | 113 | var selectIndex = this.getLayerIndexByID(newVal); |
114 | this._selectedLayerID = newVal; | 114 | this._selectedLayerID = newVal; |
115 | this._captureSelection = true; | 115 | this._captureSelection = true; |
116 | this.selectLayer(selectIndex); | 116 | //console.log(selectIndex); |
117 | //debugger; | ||
118 | this.selectLayer(selectIndex, true); | ||
117 | } | 119 | } |
118 | } | 120 | } |
119 | }, | 121 | }, |
@@ -387,6 +389,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
387 | returnObj.layerData.isTrackAnimated = false; | 389 | returnObj.layerData.isTrackAnimated = false; |
388 | returnObj.parentElementUUID = null; | 390 | returnObj.parentElementUUID = null; |
389 | returnObj.parentElement = null; | 391 | returnObj.parentElement = null; |
392 | returnObj.docUUID = this.application.ninja.currentDocument._uuid; | ||
390 | 393 | ||
391 | return returnObj; | 394 | return returnObj; |
392 | } | 395 | } |
@@ -502,7 +505,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
502 | this.playhead.addEventListener("mousedown", this.startPlayheadTracking.bind(this), false); | 505 | this.playhead.addEventListener("mousedown", this.startPlayheadTracking.bind(this), false); |
503 | this.playhead.addEventListener("mouseup", this.stopPlayheadTracking.bind(this), false); | 506 | this.playhead.addEventListener("mouseup", this.stopPlayheadTracking.bind(this), false); |
504 | this.time_markers.addEventListener("click", this.updatePlayhead.bind(this), false); | 507 | this.time_markers.addEventListener("click", this.updatePlayhead.bind(this), false); |
505 | 508 | ||
509 | // Initialize BreadCrumb | ||
510 | this.application.ninja.breadCrumbClick = false; | ||
511 | this.enablePanel(false); | ||
506 | 512 | ||
507 | } | 513 | } |
508 | }, | 514 | }, |
@@ -646,6 +652,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
646 | // Clear the timeline but not the cache | 652 | // Clear the timeline but not the cache |
647 | //console.log('TimelinePanel.handleDocumentChange'); | 653 | //console.log('TimelinePanel.handleDocumentChange'); |
648 | if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) { | 654 | if ((event.type === "closeDocument") && (this.application.ninja.documentController._documents.length > 0)) { |
655 | // Ignore extra closeDocument event that fires while there are still documents open. | ||
649 | return; | 656 | return; |
650 | } | 657 | } |
651 | this._boolCacheArrays = false; | 658 | this._boolCacheArrays = false; |