From cc19a0acba672df57b417c002900a9bd34f5a1e2 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Thu, 8 Oct 2015 15:51:11 -0700 Subject: [PATCH] [Time Conductor] Enforce minimum inner span nasa/openmctweb#151. --- .../commonUI/general/src/controllers/TimeRangeController.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index ac111ab1a9..60df6343bb 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -34,6 +34,7 @@ define( */ function TimeConductorController($scope, now) { var tickCount = 2, + innerMinimum = 1000, // 1 second initialDragValue; function formatTimestamp(ts) { @@ -139,7 +140,7 @@ define( $scope.ngModel.inner.start = clamp( initialDragValue + delta, $scope.ngModel.outer.start, - $scope.ngModel.inner.end + $scope.ngModel.inner.end - innerMinimum ); updateViewFromModel($scope.ngModel); } @@ -148,7 +149,7 @@ define( var delta = toMillis(pixels); $scope.ngModel.inner.end = clamp( initialDragValue + delta, - $scope.ngModel.inner.start, + $scope.ngModel.inner.start + innerMinimum, $scope.ngModel.outer.end ); updateViewFromModel($scope.ngModel);