aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js4
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css2
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss1
3 files changed, 5 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 93b4d67e..88b37563 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -509,6 +509,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
509 }, 509 },
510 set:function (newVal) { 510 set:function (newVal) {
511 if (newVal !== this._millisecondsOffset) { 511 if (newVal !== this._millisecondsOffset) {
512
513 var tempValue = (1/newVal) * 1000000;
514 newVal = tempValue;
515
512 this._millisecondsOffset= newVal; 516 this._millisecondsOffset= newVal;
513 this.drawTimeMarkers(); 517 this.drawTimeMarkers();
514 NJevent('tlZoomSlider',this); 518 NJevent('tlZoomSlider',this);
diff --git a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
index f7e9234e..d8293d77 100644
--- a/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
+++ b/js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css
@@ -132,7 +132,7 @@ POSSIBILITY OF SUCH DAMAGE.
132.timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); } 132.timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); }
133 133
134/* line 308, ../scss/TimelinePanel.scss */ 134/* line 308, ../scss/TimelinePanel.scss */
135.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; visibility: hidden; } 135.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%;}
136 136
137/* Configuration menu */ 137/* Configuration menu */
138/* line 318, ../scss/TimelinePanel.scss */ 138/* line 318, ../scss/TimelinePanel.scss */
diff --git a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
index 460fe5e3..4fbcc400 100644
--- a/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
+++ b/js/panels/Timeline/TimelinePanel.reel/scss/TimelinePanel.scss
@@ -335,7 +335,6 @@ POSSIBILITY OF SUCH DAMAGE.
335 background: none; 335 background: none;
336 float:left; 336 float:left;
337 margin-left: 5%; 337 margin-left: 5%;
338 visibility: hidden;
339} 338}
340 339
341/* Configuration menu */ 340/* Configuration menu */