diff options
author | Valerio Virgillito | 2012-05-24 11:59:17 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-05-24 11:59:17 -0700 |
commit | 70ff8dd670bc37c14caf850e06791d1e293b1e4b (patch) | |
tree | 8e00a27c6c908dda3e816d1f5aaf0d2a889ca5dc /js/panels/Timeline/TimelineTrack.reel | |
parent | a8eb5c65a21af3bf8d8b8eb3e65b494b8bd9bc01 (diff) | |
parent | a6db492176a85546047dae6d5ecb9cfc4325e043 (diff) | |
download | ninja-70ff8dd670bc37c14caf850e06791d1e293b1e4b.tar.gz |
Merge pull request #255 from joseeight/Document
Cleaning up referencing to documentRoot
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
-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 3d83dc36..ff684446 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -434,7 +434,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
434 | didDraw:{ | 434 | didDraw:{ |
435 | value:function () { | 435 | value:function () { |
436 | if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { | 436 | if ((!this.application.ninja.documentController.creatingNewFile)||(!this.application.ninja.currentDocument.setLevel)) { |
437 | if (this.application.ninja.currentDocument.documentRoot.children[0]) { | 437 | if (this.application.ninja.currentDocument.model.documentRoot.children[0]) { |
438 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 438 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
439 | if (selectedIndex !== false) { | 439 | if (selectedIndex !== false) { |
440 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { | 440 | if (!this.application.ninja.timeline.arrLayers[selectedIndex].layerData.created) { |
@@ -588,7 +588,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
588 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); | 588 | trackTiming = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration"); |
589 | this.nextKeyframe = 0; | 589 | this.nextKeyframe = 0; |
590 | 590 | ||
591 | this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document); | 591 | this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument.model.views.design.document); |
592 | 592 | ||
593 | for (i =0; this.currentKeyframeRule[i] ;i++) { | 593 | for (i =0; this.currentKeyframeRule[i] ;i++) { |
594 | var newTween = {}; | 594 | var newTween = {}; |