ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-19 11:17:04 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[Time Conductor] Enforce inner minimums on outer changes

Browse Source
This commit is contained in:
Victor Woeltjen 2015-10-09 07:32:46 -07:00
parent f738f84075
commit ebd8fdeee3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/commonUI/general/src/controllers/TimeRangeController.js
View File

@ -184,8 +184,10 @@ define(
ngModel.inner.start = ngModel.inner.start =
Math.max(ngModel.outer.start, ngModel.inner.start); Math.max(ngModel.outer.start, ngModel.inner.start);
ngModel.inner.end = ngModel.inner.end = Math.max(
Math.max(ngModel.outer.start, ngModel.inner.end); ngModel.inner.start + innerMinimumSpan,
ngModel.inner.end
);
$scope.startOuterText = formatTimestamp(t); $scope.startOuterText = formatTimestamp(t);
@ -200,10 +202,12 @@ define(
ngModel.outer.start ngModel.outer.start
); );
ngModel.inner.start =
Math.min(ngModel.outer.end, ngModel.inner.start);
ngModel.inner.end = ngModel.inner.end =
Math.min(ngModel.outer.end, ngModel.inner.end); Math.min(ngModel.outer.end, ngModel.inner.end);
ngModel.inner.start = Math.min(
ngModel.inner.end - innerMinimumSpan,
ngModel.inner.start
);
$scope.endOuterText = formatTimestamp(t); $scope.endOuterText = formatTimestamp(t);