aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
1 files changed, 18 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index aafc3d1d..981ddc22 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -505,11 +505,13 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
505 }, 505 },
506 millisecondsOffset:{ 506 millisecondsOffset:{
507 get:function () { 507 get:function () {
508
508 return this._millisecondsOffset; 509 return this._millisecondsOffset;
509 }, 510 },
510 set:function (newVal) { 511 set:function (newVal) {
511 if (newVal !== this._millisecondsOffset) { 512 if (newVal !== this._millisecondsOffset) {
512 513
514 this.tempValue = newVal;
513 var tempValue = (1/newVal) * 1000000; 515 var tempValue = (1/newVal) * 1000000;
514 newVal = tempValue; 516 newVal = tempValue;
515 517
@@ -1695,6 +1697,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
1695 } 1697 }
1696 }, 1698 },
1697 1699
1700 zoomTrackContainerWidthChange:{
1701 value:function () {
1702
1703 this.tempValue = this.tempValue/1000;
1704 this.tempValue *= 30;
1705
1706 this.container_tracks.style.width = (this.tempValue * 80) + "px";
1707 this.master_track.style.width = (this.tempValue * 80) + "px";
1708 this.time_markers.style.width = (this.tempValue * 80) + "px";
1709 if (this.timeMarkerHolder) {
1710 this.time_markers.removeChild(this.timeMarkerHolder);
1711 }
1712 this.drawTimeMarkers();
1713 }
1714 },
1715
1698 handleLayerScroll: { 1716 handleLayerScroll: {
1699 value:function () { 1717 value:function () {
1700 this._areTracksScrolling = true; 1718 this._areTracksScrolling = true;