ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-18 18:57:01 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #993 from nasa/revert-990-timeline-regression-817

Browse Source 
Revert "[Timeline] Provide greater initial width"
This commit is contained in:
Victor Woeltjen 2016-06-02 17:05:11 -07:00
commit e86e955682
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/timeline/src/controllers/TimelineZoomController.js
View File

@ -122,7 +122,7 @@ define(
*/
width: function (timestamp) {
var pixels = Math.ceil(toPixels(timestamp * (1 + PADDING)));
return Math.max(bounds.width * 2, pixels);
return Math.max(bounds.width, pixels);
}
};
}

2
platform/features/timeline/test/controllers/TimelineZoomControllerSpec.js
View File

@ -124,7 +124,7 @@ define(
var testPixel = mockScope.scroll.width / 4,
testMillis = controller.toMillis(testPixel);
expect(controller.width(testMillis))
.not.toBeLessThan(mockScope.scroll.width);
.toEqual(mockScope.scroll.width);
});
it("provides a width with some margin past timestamp", function () {