From 026ece395631016775a9a05a24a9e13fcb7c6704 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 2 Jun 2016 14:46:50 -0700 Subject: [PATCH] [Timeline] Provide greater initial width This avoids starting with a scrollable width too small for the initial scroll position that the zoom controller selects. Fixes #817 --- .../features/timeline/src/controllers/TimelineZoomController.js | 2 +- .../timeline/test/controllers/TimelineZoomControllerSpec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/features/timeline/src/controllers/TimelineZoomController.js b/platform/features/timeline/src/controllers/TimelineZoomController.js index 3075460428..6e97f0bd0e 100644 --- a/platform/features/timeline/src/controllers/TimelineZoomController.js +++ b/platform/features/timeline/src/controllers/TimelineZoomController.js @@ -122,7 +122,7 @@ define( */ width: function (timestamp) { var pixels = Math.ceil(toPixels(timestamp * (1 + PADDING))); - return Math.max(bounds.width, pixels); + return Math.max(bounds.width * 2, pixels); } }; } diff --git a/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js b/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js index 9e67eecc3f..bf2bc03180 100644 --- a/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js +++ b/platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js @@ -124,7 +124,7 @@ define( var testPixel = mockScope.scroll.width / 4, testMillis = controller.toMillis(testPixel); expect(controller.width(testMillis)) - .toEqual(mockScope.scroll.width); + .not.toBeLessThan(mockScope.scroll.width); }); it("provides a width with some margin past timestamp", function () {