diff options
author | Jon Reid | 2012-04-19 14:30:38 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-19 14:30:38 -0700 |
commit | 71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0 (patch) | |
tree | 78292a128cd79f2aa7fbc7a7077dea83389a52e8 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | fc22cd3b5c65dc6f137fbb59443e2061cbbcac26 (diff) | |
parent | 4465a66996f2b022ab9e838e028415fd87cfa405 (diff) | |
download | ninja-71e1e65d6aaa64afc9fffba9b1fd6d19904b52b0.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used mine.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 |
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 | } |