ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-19 13:17:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[Timeline] Update scroll position on timeout"

Browse Source
This commit is contained in:
Victor Woeltjen 2016-06-02 16:49:49 -07:00
parent beeefe517a
commit fa6e8fd5f9
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/features/timeline/bundle.js
View File

@ -472,7 +472,6 @@ define([
"implementation": TimelineZoomController,
"depends": [
"$scope",
"$timeout",
"TIMELINE_ZOOM_CONFIGURATION"
]
},

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

@ -28,12 +28,11 @@ define(
* Controls the pan-zoom state of a timeline view.
* @constructor
*/
function TimelineZoomController($scope, $timeout, ZOOM_CONFIGURATION) {
function TimelineZoomController($scope, ZOOM_CONFIGURATION) {
// Prefer to start with the middle index
var zoomLevels = ZOOM_CONFIGURATION.levels || [1000],
zoomIndex = Math.floor(zoomLevels.length / 2),
tickWidth = ZOOM_CONFIGURATION.width || 200,
width = tickWidth,
bounds = { x: 0, width: tickWidth }; // Default duration in view
function toMillis(pixels) {
@ -63,12 +62,6 @@ define(
zoomIndex += 1;
}
bounds.x = toPixels(timespan.getStart());
// Physical width may be insufficient for scroll;
// if so, try again on a timeout!
if (bounds.x + bounds.width > width) {
$timeout(initializeZoomFromTimespan.bind(null, timespan));
}
}
function initializeZoom() {
@ -129,8 +122,7 @@ define(
*/
width: function (timestamp) {
var pixels = Math.ceil(toPixels(timestamp * (1 + PADDING)));
width = Math.max(bounds.width, pixels);
return width;
return Math.max(bounds.width * 2, pixels);
}
};
}

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

@ -28,7 +28,6 @@ define(
describe("The timeline zoom state controller", function () {
var testConfiguration,
mockScope,
mockTimeout,
controller;
beforeEach(function () {
@ -38,10 +37,8 @@ define(
};
mockScope = jasmine.createSpyObj("$scope", ['$watch']);
mockScope.commit = jasmine.createSpy('commit');
mockTimeout = jasmine.createSpy('$timeout');
controller = new TimelineZoomController(
mockScope,
mockTimeout,
testConfiguration
);
});