diff options
author | Jon Reid | 2012-07-11 09:37:10 -0700 |
---|---|---|
committer | Jon Reid | 2012-07-11 09:37:10 -0700 |
commit | 3bea1cb3fb53bac17daa31f4b5cf561fbd040dda (patch) | |
tree | 860511066f8566f3371a053725c6545e3f871c62 /js/panels | |
parent | 65a9d88691a9f10130ebd853492dab0d59f4aa53 (diff) | |
parent | f4c9d9360918f41a8a067bd1d93d59982819938b (diff) | |
download | ninja-3bea1cb3fb53bac17daa31f4b5cf561fbd040dda.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/Track.reel/images/gridline.jpg | bin | 0 -> 724 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index b2683d30..12e87636 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | |||
@@ -303,7 +303,7 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, { | |||
303 | newTween; | 303 | newTween; |
304 | 304 | ||
305 | selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 305 | selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
306 | this.application.ninja.timeline.selectLayer(selectedIndex, true); | 306 | this.application.ninja.timeline.selectLayers([selectedIndex]); |
307 | 307 | ||
308 | currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); | 308 | currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80); |
309 | currentMillisec = currentMillisecPerPixel * clickPos; | 309 | currentMillisec = currentMillisecPerPixel * clickPos; |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index f443553c..c9516d1f 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -645,7 +645,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
645 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); | 645 | var selectedIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID); |
646 | // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated | 646 | // this.application.ninja.timeline.selectLayer(selectedIndex, true); // deprecated |
647 | this.application.ninja.timeline.selectLayers([selectedIndex]); | 647 | this.application.ninja.timeline.selectLayers([selectedIndex]); |
648 | this.application.ninja.timeine.updateStageSelection(); | 648 | this.application.ninja.timeline.updateStageSelection(); |
649 | if (this.tweens.length < 1) { | 649 | if (this.tweens.length < 1) { |
650 | this.insertTween(0); | 650 | this.insertTween(0); |
651 | this.addAnimationRuleToElement(ev); | 651 | this.addAnimationRuleToElement(ev); |
diff --git a/js/panels/Timeline/Track.reel/images/gridline.jpg b/js/panels/Timeline/Track.reel/images/gridline.jpg new file mode 100644 index 00000000..9f451b0a --- /dev/null +++ b/js/panels/Timeline/Track.reel/images/gridline.jpg | |||
Binary files differ | |||