aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJon Reid2012-04-13 14:45:08 -0700
committerJon Reid2012-04-13 14:45:08 -0700
commit0e6e40a835a73ba04156d579f5a0c900a9b5c4eb (patch)
treed725649d7630420d1025215e4d7a86c91038f1e0 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent96f78dec0e8ddd9ad975ec8150733f4945ff9095 (diff)
downloadninja-0e6e40a835a73ba04156d579f5a0c900a9b5c4eb.tar.gz
Timeline: Bug fixes for restoring tweens on new document and breadcrumb.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 64ac08d3..87fd8282 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -469,12 +469,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
469 469
470 didDraw:{ 470 didDraw:{
471 value:function () { 471 value:function () {
472 if (!this.application.ninja.documentController.creatingNewFile) { 472 if ((!this.application.ninja.documentController.creatingNewFile) || (this.application.ninja.breadCrumbClick)) {
473 if (this.application.ninja.currentDocument.documentRoot.children[0]) { 473 if (this.application.ninja.currentDocument.documentRoot.children[0]) {
474 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); 474 var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID);
475 if (selectedIndex !== false) { 475 if (selectedIndex !== false) {
476 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { 476 if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) {
477 this.retrieveStoredTweens(); 477 this.retrieveStoredTweens();
478 this.application.ninja.breadCrumbClick = false;
478 } 479 }
479 } 480 }
480 } 481 }