diff options
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 20e217e9..8fec1d7d 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -363,6 +363,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
363 | draw: { | 363 | draw: { |
364 | value: function() { | 364 | value: function() { |
365 | 365 | ||
366 | |||
367 | |||
366 | // Drag and Drop: | 368 | // Drag and Drop: |
367 | // Do we have a helper to append? | 369 | // Do we have a helper to append? |
368 | if (this._appendHelper === true) { | 370 | if (this._appendHelper === true) { |
@@ -664,6 +666,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
664 | value:function () { | 666 | value:function () { |
665 | this.user_layers.scrollTop = this.layout_tracks.scrollTop; | 667 | this.user_layers.scrollTop = this.layout_tracks.scrollTop; |
666 | this.layout_markers.scrollLeft = this.layout_tracks.scrollLeft; | 668 | this.layout_markers.scrollLeft = this.layout_tracks.scrollLeft; |
669 | this.playheadmarker.style.top = this.layout_tracks.scrollTop + "px"; | ||
667 | } | 670 | } |
668 | }, | 671 | }, |
669 | 672 | ||
@@ -684,6 +687,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
684 | var clickedPosition = event.target.offsetLeft + event.offsetX; | 687 | var clickedPosition = event.target.offsetLeft + event.offsetX; |
685 | this.playhead.style.left = (clickedPosition - 2) + "px"; | 688 | this.playhead.style.left = (clickedPosition - 2) + "px"; |
686 | this.playheadmarker.style.left = clickedPosition + "px"; | 689 | this.playheadmarker.style.left = clickedPosition + "px"; |
690 | |||
691 | |||
692 | |||
687 | var currentMillisecPerPixel = Math.floor(this.millisecondsOffset / 80); | 693 | var currentMillisecPerPixel = Math.floor(this.millisecondsOffset / 80); |
688 | var currentMillisec = currentMillisecPerPixel * clickedPosition; | 694 | var currentMillisec = currentMillisecPerPixel * clickedPosition; |
689 | this.updateTimeText(currentMillisec); | 695 | this.updateTimeText(currentMillisec); |