get correct timeline length

Author: JacksonRG

src/timeline/js/controllers.js

@@ -281,7 +281,7 @@ App.controller("TimelineCtrl", function ($scope) {
 
   // Change the scale and apply to scope
   $scope.setScroll = function (normalizedScrollValue) {
-    var timeline_length = Math.min(32767, $scope.getTimelineWidth(0));
+    var timeline_length = $scope.getTimelineWidth(0);
     var scrolling_tracks = $("#scrolling_tracks");
     var horz_scroll_offset = normalizedScrollValue * timeline_length;
     scrolling_tracks.scrollLeft(horz_scroll_offset);

src/timeline/js/directives/ruler.js

@@ -88,6 +88,7 @@ App.directive("tlScrollableTracks", function () {
 
       // Pans the timeline (on middle mouse clip and drag)
       element.on("mousemove", function (e) {
+
         if (is_scrolling) {
           // Calculate difference from last position
           var difference = {x: starting_mouse_position.x - e.pageX, y: starting_mouse_position.y - e.pageY};
@@ -206,8 +207,6 @@ App.directive("tlRuler", function ($timeout) {
 
         fpt = framesPerTick(scope.pixelsPerSecond, scope.project.fps.num ,scope.project.fps.den);
         frame = startFrame;
-        console.log('fpt: ' + fpt);
-        console.log('startFrame: ' + startFrame);
         while ( frame <= endFrame){
           t = frame / fps;
           pos = t * scope.pixelsPerSecond;

src/windows/views/zoom_slider.py

@@ -399,15 +399,6 @@ def wheelEvent(self, event):
 
     def setZoomFactor(self, zoom_factor):
         """Set the current zoom factor"""
-        # Get max width of timeline
-        project_duration = get_app().project.get("duration")
-        tick_pixels = 100
-        min_zoom_factor = 1.0
-        max_zoom_factor = 64.0
-        if self.scrollbar_position[3] > 0.0:
-            # Calculate the new zoom factor, based on pixels per tick
-            max_zoom_factor = project_duration / (self.scrollbar_position[3] / tick_pixels)
-
         # Force recalculation of clips
         self.zoom_factor = zoom_factor