aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJonathan Duran2012-04-19 13:58:42 -0700
committerJonathan Duran2012-04-19 13:58:42 -0700
commit4465a66996f2b022ab9e838e028415fd87cfa405 (patch)
treeea8404b7dd06f40407a9ed70118362b38697a733 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent978c53b8e1e2476bb47c15717bf2bb3aacf3948d (diff)
parentb7d5b9e9b69644cdafdcc9b7ef2fe2674f35db18 (diff)
downloadninja-4465a66996f2b022ab9e838e028415fd87cfa405.tar.gz
Merge branch 'timeline-local' of github.com:ntfx47/ninja-internal into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 84d93ea3..aacddd3b 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -469,13 +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) || (this.application.ninja.breadCrumbClick)) { 472 if ((!this.application.ninja.documentController.creatingNewFile) || (!this.application.ninja.currentDocument.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 } 481 }