Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
	Resolved by using both; both were needed.

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 c790466c..aafc3d1d 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, {
     },
         set:function (newVal) {
             if (newVal !== this._millisecondsOffset) {
+
+                var tempValue = (1/newVal) * 1000000;
+                newVal = tempValue;
+
                 this._millisecondsOffset= newVal;
                 this.drawTimeMarkers();
                 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.
 .timeline-dnd-helper { -webkit-transform: scale(0.9, 0.9); }
 
 /* line 308, ../scss/TimelinePanel.scss */
-.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%; visibility: hidden; }
+.tl_slider { width: 65px; height: 5px; background: none; float: left; margin-left: 5%;}
 
 /* Configuration menu */
 /* 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.
     background: none;
     float:left;
     margin-left: 5%;
-    visibility: hidden;
 }
 
 /* Configuration menu */